Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,741 Commits 36 Branches 189 Tags
840ca734640a440394e3b052d7898e05c2c8147d
Commit Graph

87741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
 2020-10-30 04:21:07 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Laurent Destailleur
925669ee33 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-30 03:25:52 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Laurent Destailleur
d7ac505cd0 Merge pull request #15202 from ATM-Consulting/fix/10.0_make_formConfirm_an_addreplace_hook_2 
FIX 10.0 - make formConfirm an addreplace-type hook
 2020-10-29 17:47:56 +01:00
Laurent Destailleur
e79a061c19 Merge pull request #15204 from frederic34/patch-6 
Update timeline.inc.php
 2020-10-29 17:46:31 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
 2020-10-29 13:10:10 +01:00
Laurent Destailleur
d7225327e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-29 11:13:29 +01:00
Laurent Destailleur
2a386b6fea Fix set subledger account 2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d Fix bad sort order 2020-10-29 11:06:18 +01:00
Laurent Destailleur
980cb095da Fix sort order use last sortorder if several fields. 2020-10-29 11:05:43 +01:00
Laurent Destailleur
b1b7a7c725 Fix missing transaction 2020-10-29 10:40:50 +01:00
Laurent Destailleur
89dcbfae82 Merge pull request #15212 from Dolibarr/revert-15182-FIX_11.0_various_payment_subledger 
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
 2020-10-29 10:37:33 +01:00
Laurent Destailleur
c3f0f3cc4a Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback" 2020-10-29 10:36:48 +01:00
Frédéric FRANCE
20c00d0c43 Update timeline.inc.php 2020-10-28 17:54:45 +01:00
Florian Mortgat
a4af2e94a9 FIX 10.0 - make formConfirm an addreplace-type hook 2020-10-28 17:08:09 +01:00
Laurent Destailleur
f02a35d398 Fix bad array when year is not defined into graph stat of products 2020-10-28 16:47:00 +01:00
Laurent Destailleur
6363a6cd60 Fix sanitize 2020-10-28 14:11:46 +01:00
Laurent Destailleur
47dfe633f9 Fix filter on date on statistics of products 2020-10-28 13:19:35 +01:00
Laurent Destailleur
866934e6c5 Merge pull request #15182 from marc-dll/FIX_11.0_various_payment_subledger 
FIX: various payments: bad data handling for subledger account + useless db commit/rollback
 2020-10-27 18:07:47 +01:00
Marc de Lima Lucio
a33d34a165 FIX: various payments: bad data handling for subledger account + useless db commit/rollback 2020-10-27 16:48:56 +01:00
Laurent Destailleur
027c5582c3 Merge pull request #15178 from frederic34/patch-6 
dol_print_date called with a bad value
 2020-10-27 11:55:07 +01:00
Laurent Destailleur
5943e784ec Remove var_dump 2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18 Fix label 2020-10-27 10:26:30 +01:00
Laurent Destailleur
ffc961599c FIX error 500 on cash fence 2020-10-27 10:19:00 +01:00
Frédéric FRANCE
da4f3fab14 dol_print_date called with a bad value 2020-10-27 08:10:19 +01:00
Laurent Destailleur
7806bdabb3 Merge pull request #15177 from Ahuahuachi/12.0-FIX-15161 
FIX #15161 MO translation conflict
 2020-10-27 01:23:26 +01:00
Alfredo Altamirano
214cd2c99b Update references of MO translation string 2020-10-26 15:44:26 -06:00
Alfredo Altamirano
43fd659d2a Rename translation string MO for ManufacturingOrder 2020-10-26 15:38:42 -06:00
Laurent Destailleur
12289ceb9e Merge pull request #15159 from Ahuahuachi/10.0 
FIX #15111 Fix special characters output in PDF
 2020-10-26 19:20:53 +01:00
Laurent Destailleur
e57cd74f22 Merge pull request #15166 from atm-quentin/FIX_select2_extra_witdh_on_advtargetmailing 
FIX table making extrafield input too small on advance target mailing
 2020-10-26 19:11:37 +01:00
Laurent Destailleur
f18a13b2d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:08:11 +01:00
Laurent Destailleur
78a52eda96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/main.inc.php
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:05:30 +01:00
Laurent Destailleur
50ede5224a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-26 19:02:47 +01:00
Laurent Destailleur
c58d3d0cf7 FIX #15163 2020-10-26 19:02:26 +01:00
Laurent Destailleur
ca66df2a7b Merge pull request #15167 from marc-dll/FIX_10.0_customer_price_triggers 
FIX: product customer prices: missing triggers in CRUD class
 2020-10-26 18:59:44 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Laurent Destailleur
ec0da6921a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-25 21:10:00 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
Laurent Destailleur
b80d135fcb Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage 
fix mail error message
 2020-10-25 14:50:23 +01:00