Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 02:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 36 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

4386 Commits

Author SHA1 Message Date
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
af4405c669 FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE 2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf Remove white lines 2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd Clean code 2018-12-16 19:30:54 +01:00
Laurent Destailleur
003c463ee4 FIX Can't delete a line of minimal stock per warehouse 2018-12-16 19:23:53 +01:00
Laurent Destailleur
e14b426985 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/exports/export.php
 2018-12-16 13:39:16 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Norbert Penel
0f3a063c91 Events are not linked to products 
when created from a product card, the events are not linked to the product
 2018-12-15 15:57:15 +01:00
Laurent Destailleur
2d4403c3bf Merge pull request #10184 from homer8173/patch-5 
Events are not linked to products
 2018-12-15 15:46:22 +01:00
Laurent Destailleur
1bce3f6c6b Fix phpcs 2018-12-15 14:54:10 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
2d2481cc5f Merge pull request #10068 from prietojc/patch-2 
New: Update just the multiprices that have been changed
 2018-12-14 19:22:26 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3 Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
78cdade1a7 Merge pull request #10211 from atm-john/fix_error_message_details 
Add détails to error message
 2018-12-14 14:26:38 +01:00
Laurent Destailleur
177675b73d Merge pull request #10225 from madx666/contrib 
Change type_mouvement on movement_list
 2018-12-14 10:40:00 +01:00
Laurent Destailleur
f97b561af0 Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
madx666
3159c3f8d1 Change type_mouvement on movement_list 2018-12-13 11:28:49 +01:00
BENKE Charlene
946d55a7bb fk_default_warehouse not defined 2018-12-12 00:41:11 +01:00
ATM John BOTELLA
6a4df05fd0 fix error message details 2018-12-08 17:29:07 +01:00
Norbert Penel
b4475e434f Events are not linked to products 
when created from a product card, the events are not linked to the product
 2018-12-05 15:18:45 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
BENKE Charlene
1dc2fc5060 fix #9475 2018-12-01 16:17:52 +01:00
Inovea Conseil
0ba5fda3da Update price.php 2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1 Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
ptibogxiv
310dc46113 Update list.php 2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6 Fix duration display product/service in list.php 2018-11-29 13:44:10 +01:00
Philippe GRAND
05d617b759 fix typo error 2018-11-26 14:33:45 +01:00
JC Prieto
54418c168b New: Update only the multiprices that have been changed 
When a multiprice was changed all level prices were updated at once and history of prices is getting very large.
 2018-11-22 12:38:10 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Frédéric FRANCE
20acf440a3 Update api_products.class.php 2018-11-10 07:55:01 +01:00
Frédéric FRANCE
b271e1a3b0 The variable $i seems to be never defined. 2018-11-10 07:27:20 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f Merge branch 'develop' into feature/product-search-barcode 2018-11-08 16:57:49 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Bouquet
cb10da4d41 [Core] Add product search from barcode via REST api 2018-11-05 23:06:19 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00