Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,368 Commits 39 Branches 191 Tags
ab4941a558ff55ce00aabbc7bab1807216abd0c1
Commit Graph

94368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ab4941a558 Fix not visible button when missing permission 2021-05-29 02:22:30 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
Laurent Destailleur
421681cda4 FIX Navigation in list of holiday 
Conflicts:
	htdocs/holiday/view_log.php
 2021-05-26 15:25:44 +02:00
Laurent Destailleur
9b2fb74dca Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note 
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
 2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc Update pdf_cyan.modules.php 2021-05-25 21:39:50 +02:00
Laurent Destailleur
98d60870d5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:46 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
307c5cb276 Merge pull request #17702 from r3dge/13.0 
bug fix : replacing orders by donations and setting required field to…
 2021-05-25 20:12:07 +02:00
Laurent Destailleur
0d31db0ba5 Update don.class.php 2021-05-25 20:11:46 +02:00
Laurent Destailleur
6d637bf1e1 Merge pull request #17707 from FHenry/12_fix_export_balance 
fix: export balance with double quote
 2021-05-25 19:36:57 +02:00
Laurent Destailleur
71b35ef0e5 Fix regression - can't reset parent company 2021-05-25 12:11:06 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
r3dge
647997af28 fixing error on date 2021-05-23 18:15:00 +02:00
r3dge
f81136231a fixing PUT request for donation update 2021-05-23 18:09:10 +02:00
r3dge
67cab8c1f2 bug fix : replacing orders by donations and setting required field to allow post action in rest API for url donations. See issue #17700 2021-05-21 16:01:04 +02:00
Laurent Destailleur
93501a1147 Fix phpcs 2021-05-20 15:25:56 +02:00
Laurent Destailleur
3359ae93d8 Merge pull request #17654 from atm-adrien/FIX_missing_hooks 
FIX : Missing hook in cibles.php (for mailing)
 2021-05-20 15:24:12 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 14:58:50 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Laurent Destailleur
7a24d6399b Merge pull request #17680 from SylvainLegrand/13.0 
avoid an infinite loop between a parent company and a branch when updating customer rates
 2021-05-20 14:54:28 +02:00
Laurent Destailleur
28487fac12 Create societe.class.php 2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf Fixing style errors. 2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358 Update societe.class.php 2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040 Update societe.class.php 2021-05-20 14:38:24 +02:00
Laurent Destailleur
e8d9e9e697 Merge pull request #17659 from gmilad/gmilad-fix-17608-b10 
Fix issue #17608 for branch 10
 2021-05-20 14:34:12 +02:00
Laurent Destailleur
5eeb7d474c Merge pull request #17655 from ATM-Consulting/FIX_13.0_wrong_error_message_MAIN_DISABLE_ALL_MAILS 
FIX 13.0 - wrong error message for mail sending failure
 2021-05-20 14:33:40 +02:00
Laurent Destailleur
90443e26ac Merge pull request #17660 from gmilad/gmilad-fix-17608-b11 
Fix issue #17608 for branch 11
 2021-05-20 14:30:30 +02:00
Laurent Destailleur
b71eb6b75e Merge pull request #17668 from atm-john/13.0_fix_dirt 
FIX : Remove forgotten  echo
 2021-05-20 14:14:25 +02:00
Laurent Destailleur
5fd4da66cb Merge pull request #17673 from OPEN-DSI/v11-fix-supplier-order-special-code 
FIX keep special code on supplier order lines for external modules
 2021-05-20 14:13:07 +02:00
Laurent Destailleur
d49596d798 Merge pull request #17670 from atm-john/13.0_fix_logpricespam 
Fix :  multiprices log spam
 2021-05-20 09:19:39 +02:00
Sylvain Legrand
70c85cfd72 Merge branch '13.0' of https://github.com/SylvainLegrand/dolibarr into 13.0 2021-05-19 19:09:27 +02:00
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +02:00
stickler-ci
b5ac78d9a0 Fixing style errors. 2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642 Update societe.class.php 2021-05-19 18:47:07 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
ATM john
5fd02992c0 Remove forgotten echo 2021-05-19 10:26:04 +02:00
gmilad
4bb18db905 Fix issue #17608 for branch 11 
Fix issue #17608 for branch 11
 2021-05-18 19:53:35 +02:00
gmilad
57732d4265 Fix issue #17608 for branch 10 
Fix issue #17608 for branch 10
 2021-05-18 19:45:15 +02:00
Florian Mortgat
6cccd77508 FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance) 2021-05-18 17:57:23 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
0c4884bb2c Fix sql error 2021-05-18 12:44:56 +02:00
Laurent Destailleur
23514c957c Merge pull request #17641 from WimpyMan/fix_sql_projects 
html.form.class.php: Fixed SQL error (projects)
 2021-05-18 12:36:18 +02:00
Laurent Destailleur
495d2e79f4 Update html.form.class.php 2021-05-18 12:35:30 +02:00
Laurent Destailleur
6d34c34cb5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-18 12:02:52 +02:00