Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7833ac8fb0 Code comment 2021-05-20 17:53:28 +02:00
stickler-ci
6f050fc23a Fixing style errors. 2021-05-20 15:48:04 +00:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Dorian Vabre
bbce806cb5 typo 2021-05-20 17:32:48 +02:00
Dorian Vabre
83555da795 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Laurent Destailleur
c561669edf Code comment 2021-05-20 17:02:22 +02:00
Laurent Destailleur
f2d706950a
Merge pull request #17688 from DorianVabre/fix_dev_getpost_agenda 
fix: getpost exportagenda apha to alpha
 2021-05-20 16:54:02 +02:00
Dorian Vabre
ab4ae85eb8 fix: getpost exportagenda apha to alpha 2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622 wip 2021-05-20 16:30:49 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Damien BENOIT
072e98e730
Merge pull request #25 from Dolibarr/develop 
Update fork
 2021-05-20 15:29:42 +02:00
Laurent Destailleur
eb0f4d9765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:26:26 +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
5191a419d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +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
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1 
FIX wrong variable fk_code_ventilation register for addline
 2021-05-20 14:31:52 +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
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1 
Compatibility phpv8
 2021-05-20 14:29:18 +02:00
Laurent Destailleur
30ab0b05b7
Update list.php 2021-05-20 14:28:43 +02:00
Laurent Destailleur
eec1fefaa5
Update list.php 2021-05-20 14:25:54 +02:00
Laurent Destailleur
2604b8f9b5
Update list.php 2021-05-20 14:18:00 +02:00
Laurent Destailleur
4016db9b08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 14:17:09 +02:00
Laurent Destailleur
2fabb986c8 Update doc 2021-05-20 14:16:31 +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
a0dc991fb1
Merge pull request #17672 from dolibit-ut/patch-331 
Update llx_00_c_country.sql
 2021-05-20 14:13:58 +02:00
Laurent Destailleur
1414a24fdd
Merge pull request #17671 from dolibit-ut/patch-330 
Update llx_20_c_departements.sql
 2021-05-20 14:13:35 +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
854292b77e
Merge pull request #17665 from frederic34/patch-4 
Fix issue when loading external libs (pb with autoloader conflict and luracast)
 2021-05-20 14:06:27 +02:00
Florian HENRY
d70bbe29b5 fix 2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice 2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a done 2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var 
fix: change societe by company varaible name in all file
 2021-05-20 13:54:01 +02:00
Laurent Destailleur
c80c261db5
Merge pull request #17684 from FHenry/dev_fix_inventorylink_into_stockmvt 
add inventory link into mvt stock list
 2021-05-20 13:52:54 +02:00
Laurent Destailleur
1ada0ddcb1
Merge pull request #17682 from frederic34/patch-5 
complete tooltip product
 2021-05-20 13:52:25 +02:00
Laurent Destailleur
930138586a
Merge pull request #17686 from FHenry/dev_fix_filtercat_onthirdpartylit_when_massaction 
fix: on mass action confirm box tag filter must not do LEFT JOIN
 2021-05-20 13:51:51 +02:00
Florian HENRY
5e6d6ccf67 same bug on invoie list 2021-05-20 13:45:52 +02:00