Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,088 Commits 36 Branches 189 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

3762 Commits

Author SHA1 Message Date
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Laurent Destailleur
1756d2833c Merge pull request #16513 from AlexisLaurier/develop 
Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
 2021-03-02 19:15:22 +01:00
Alexis LAURIER
516e7a3955 Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop 2021-03-02 16:04:37 +01:00
Alexis LAURIER
e219972936 avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED 2021-03-02 16:04:26 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
6dfca9f1f5 code syntax commande directory 2021-02-23 20:46:19 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Frédéric FRANCE
75b378edd3 remove unused code 2021-02-18 22:47:41 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
ptibogxiv
39b29a7d68 Fix set date delivery on create order form 2021-02-16 17:40:00 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
6dfc6c7edf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/filefunc.inc.php
 2021-02-11 18:33:03 +01:00
Laurent Destailleur
c306e8ebe9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-11 18:23:47 +01:00
Laurent Destailleur
c2df267858 Merge pull request #16242 from frederic34/patch-4 
remove deprecated
 2021-02-10 01:29:47 +01:00
Frédéric FRANCE
097ff0d7b6 Update commande.class.php 2021-02-09 22:14:46 +01:00
ptibogxiv
e5f6a64846 FIX update order by api 
fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)
 2021-02-09 19:24:36 +01:00
Laurent Destailleur
92a19c0caa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2021-02-09 18:34:50 +01:00
Frédéric FRANCE
2c6656b2ad Update card.php 2021-02-09 18:07:21 +01:00
Laurent Destailleur
1f441deb5d Merge pull request #16237 from AlexisLaurier/13.0 
13.0 - Fix db begin() not closed into commande.class.php
 2021-02-09 18:06:36 +01:00
Frédéric FRANCE
fb4aea8223 Update card.php 2021-02-09 18:02:41 +01:00
LAURIER Alexis
abf2875eba commande.class.php - move db->begin() into cloture 
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
 2021-02-09 14:25:45 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Laurent Destailleur
a84bc05f01 Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES 
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
 2021-02-09 13:39:25 +01:00
Laurent Destailleur
89bda722bf Merge pull request #16232 from frederic34/paymentvat 
use camelCaps name
 2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522 deprecate non camelCaps functions 2021-02-09 13:25:55 +01:00
Laurent Destailleur
a5386246cd Merge pull request #16225 from frederic34/facturerec 
clean deprecated modelpdf to model_pdf
 2021-02-09 13:23:25 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Frédéric FRANCE
898bf55202 Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Frédéric FRANCE
815f3602e3 clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
6e6b5973b8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-08 17:35:44 +01:00
Laurent Destailleur
8b3c872f2a Fix warning 2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91 Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning 
FIX: warning when adding a line if $remise_percent is an empty string
 2021-02-08 17:34:29 +01:00
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00