Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
95,795 Commits 36 Branches 189 Tags
9d8ec0441b7614c43fa4336d0ecda1aa3cb15ffe
Commit Graph

23424 Commits

Author SHA1 Message Date
Laurent Destailleur
8fc89b9ef1 Merge pull request #16511 from FHenry/13.0 
fix #16510 (missing ($this->) in previous PR
 2021-03-02 15:49:13 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Florian HENRY
373d52a562 Merge remote-tracking branch 'origin/13.0' into 13.0 2021-03-02 15:33:38 +01:00
Laurent Destailleur
a5bcc47d0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-02 15:29:54 +01:00
Laurent Destailleur
a82ad6a02c Fix phpcs 2021-03-02 15:29:27 +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
lmarcouiller
c5ac79e34c Fix #16432 : Update of getCountriesinEEX 2021-03-02 15:24:55 +01:00
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00
Laurent Destailleur
495c61c231 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-03-02 15:12:41 +01:00
Laurent Destailleur
5fd341bbd3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-03-02 15:11:18 +01:00
Laurent Destailleur
1f25f2bb7e Fix phpcs 2021-03-02 15:09:29 +01:00
Laurent Destailleur
cdfb9254b3 Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields 
FIX : select list dependencies now work for ModuleBuilder sellist field
 2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e Update commonobject.class.php 2021-03-02 14:47:35 +01:00
Laurent Destailleur
7144e80063 Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus 
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
 2021-03-02 14:45:05 +01:00
Florian HENRY
27c354567a FIX : select list dependencies now work for ModuleBuilder sellist field 2021-03-02 14:06:11 +01:00
Laurent Destailleur
acb7b30eb0 Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
1132ed306c Merge pull request #16506 from andreubisquerra/patch-1 
Avoid php errors if negative var in Receipt Module
 2021-03-02 12:50:57 +01:00
Frédéric FRANCE
e1ff1c736c fix typo 
Conflicts:
	htdocs/core/login/functions_openid.php
 2021-03-02 12:41:34 +01:00
Laurent Destailleur
25b2de4874 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-02 12:40:00 +01:00
Laurent Destailleur
ba04c94b2d Merge pull request #16502 from frederic34/patch-3 
fix typo
 2021-03-02 12:39:26 +01:00
Laurent Destailleur
ef99b0f98c Update modulebuilder.lib.php 2021-03-02 12:38:17 +01:00
Laurent Destailleur
a161edefb1 Look and feel v14 2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3 Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:05:20 +01:00
Florian HENRY
593ae78761 avoid php wrning 2021-03-02 10:55:23 +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
f1f950e8b7 Close #16395 - Can filter on proposal source in list 2021-03-02 00:11:15 +01:00
andreubisquerra
5bb7c521aa Update dolreceiptprinter.class.php 2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775 Avoid php errors if negative var in Receipt Module 
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
 2021-03-01 23:09:07 +01:00
Frédéric FRANCE
f2cdbf6bb2 Merge remote-tracking branch 'upstream/develop' into add_rule 2021-03-01 21:22:34 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Florian HENRY
32ef55cd9e working default status/percent for event actioncomm 2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab default envent status 2021-03-01 19:54:30 +01:00
Florian HENRY
0edae6e19a add class default values 2021-03-01 18:25:23 +01:00
Frédéric FRANCE
eb62750aab fix typo 2021-03-01 18:06:03 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
 2021-03-01 17:46:36 +01:00
stickler-ci
d20ba5a665 Fixing style errors. 2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668 FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice 2021-03-01 16:34:42 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Laurent Destailleur
b2cfc431bc Merge pull request #16489 from aspangaro/13p7 
FIX: Total_ht not show in contract link element
 2021-03-01 14:07:29 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
490faec547 FIX Timezone problems 
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
 2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c FIX Timezone problems 2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
de241eced3 FIX: Total_ht not show in contract link element 2021-02-28 22:22:20 +01:00