lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,264 Commits 43 Branches 150 Tags 886 MiB
2f5eb2aff7
Commit Graph

94264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2f5eb2aff7 FIX #16131 2021-02-01 20:09:50 +01:00
Laurent Destailleur
cc36c2455f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-01 15:41:32 +01:00
Laurent Destailleur
e6deed1601 Fix collapse 2021-02-01 15:40:59 +01:00
Laurent Destailleur
c5d6380399
Merge pull request #16126 from andreubisquerra/develop 
Clean template code to create after edit in receipt printer module
 2021-02-01 10:55:27 +01:00
andreubisquerra
ed258b95da
Clean template code to create after edit in receipt printer module 
Cleaning template code is more clear to users
 2021-01-31 22:33:07 +01:00
Laurent Destailleur
7de4e622a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:12:26 +01:00
Laurent Destailleur
7ffa9c6d99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-01-31 19:11:34 +01:00
Laurent Destailleur
99ccfee9ed
Merge pull request #16120 from pvma/12.0 
Fix/FIX: Show missing notification in Event in user dashboard if assigned by others
 2021-01-31 19:07:59 +01:00
Laurent Destailleur
641885d814 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:05:27 +01:00
Laurent Destailleur
582c37c378 Code comment 2021-01-31 19:05:07 +01:00
Laurent Destailleur
3801dd34cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 19:02:57 +01:00
Laurent Destailleur
d023afb66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-31 18:55:11 +01:00
Laurent Destailleur
188ed6984f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-01-31 18:54:32 +01:00
Laurent Destailleur
08aa3eac00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 18:54:19 +01:00
Laurent Destailleur
9ef5f26624
Merge pull request #14022 from OPEN-DSI/fix_supplier_order_dispatching 
FIX: Fix detect dispatched product and set to received completely when the supplier order have services
 2021-01-31 18:51:57 +01:00
Paul Vincent M. Ancajas
d80709a7b9 Fix/FIX: making sure the return agenda is only specific to user 2021-02-01 01:41:19 +08:00
Laurent Destailleur
758d91b4a3
Merge pull request #16087 from ATM-Consulting/fix/11.0_required_extrafields_of_type_sellist_not_properly_checked 
FIX 11.0 - mandatory extrafields of type sellist
 2021-01-31 18:18:05 +01:00
Laurent Destailleur
18d222f32f Fix code comment 2021-01-31 18:06:02 +01:00
Laurent Destailleur
3473e0a5d0 Exclude include if not required 2021-01-31 17:10:31 +01:00
Laurent Destailleur
f461bccc02 Fix var not defined 2021-01-31 17:06:42 +01:00
Laurent Destailleur
4c9bf1d97e Advice for ajax services 2021-01-31 13:21:12 +01:00
Laurent Destailleur
dad6778570 Prepare removal of libelle and lib into label 2021-01-31 13:07:41 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
d047cf488d Fix price2num 2021-01-31 12:51:11 +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
stickler-ci
726e0ceff0 Fixing style errors. 2021-01-31 08:16:59 +00:00
Paul Vincent M. Ancajas
80714d8d6d Fix/FIX: Show notification in Event box of user in his dashboard if assigned by others 2021-01-31 16:09:35 +08:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
58dec39f94 Fix start and end month for turnover report. 2021-01-30 17:07:13 +01:00
Laurent Destailleur
215752a93c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 14:04:14 +01:00
Laurent Destailleur
aa4956caef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 13:57:53 +01:00
Laurent Destailleur
ca7738c9b3 FIX #16107 2021-01-30 13:57:42 +01:00
Laurent Destailleur
2b59a20ce1
Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe 
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
 2021-01-30 13:22:00 +01:00
Laurent Destailleur
6fe5c2f599
Merge pull request #16109 from grandoc/new_branch_30_01_2021 
missing declaration
 2021-01-30 13:08:56 +01:00
Laurent Destailleur
4f73d26f6a
Merge pull request #16094 from aspangaro/12p1 
FIX: Accountancy - label_operation is used instead of label_compte
 2021-01-30 13:04:54 +01:00
Laurent Destailleur
ce82e1f11c
Merge pull request #16093 from atm-gauthier/NEW_develop/fk_user_on_social_charge 
NEW Can set an employee on each social contribution
 2021-01-30 13:04:00 +01:00
Laurent Destailleur
96aa0b946d
Merge pull request #16106 from fappels/13_fix_create_mo 
FIX: 13 create MO, Column 'tms' cannot be null
 2021-01-30 12:59:07 +01:00
Philippe GRAND
e584792382 missing declaration 2021-01-30 12:57:06 +01:00
Laurent Destailleur
1063b97c22 Close #16099 Close #16098 2021-01-30 12:55:38 +01:00
Philippe GRAND
0f19a11ebe missing declaration 2021-01-30 12:54:10 +01:00
Laurent Destailleur
06b0b0ac66
Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE 
Bug Photo in propal
 2021-01-30 12:51:33 +01:00
Laurent Destailleur
6db7a840bc
Merge pull request #16103 from bb2a/patch-1 
Bug Photo in propal
 2021-01-30 12:50:56 +01:00
Laurent Destailleur
ccf2832938 Clean code 2021-01-30 12:45:43 +01:00
Francis Appels
2436e7c5b2 FIX: 13 create MO, Column 'tms' cannot be null 2021-01-29 19:39:50 +01:00
atm-lena
cfca26a727 Fix fix 2021-01-29 16:20:43 +01:00
Anthony Berton
66dde099ed Merge branch 'bug_PROPOSALS_WITH_PICTURE' of https://github.com/bb2a/dolibarr into bug_PROPOSALS_WITH_PICTURE 2021-01-29 15:40:22 +01:00
Anthony Berton
6b62d03993
Update pdf_cyan.modules.php 2021-01-29 13:56:04 +01:00
Anthony Berton
e48fc6c3d0 Update pdf_cyan.modules.php 2021-01-29 13:51:06 +01:00