lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,739 Commits 43 Branches 150 Tags 886 MiB
eb92b7a25f
Commit Graph

102739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
eb92b7a25f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-29 17:27:29 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2022-04-29 17:27:12 +02:00
Laurent Destailleur
a6f48868f1
Merge pull request #20689 from atm-gauthier/FIX/trad_expense_tax_cat_label 
FIX : label tax cat trad
 2022-04-29 17:22:15 +02:00
Laurent Destailleur
7a440d8c73
Merge pull request #20713 from daraelmin/daraelmin-bookkeping-create-mode 
Fix #20712 - No more empty wrong line added in bookkeeping confirme_create
 2022-04-29 17:08:49 +02:00
Laurent Destailleur
2b272b01fb
Merge pull request #20718 from FHenry/14.0_fix_trunc_refclientheader_pdf 
fix: truncate Customer Reference too long on PDF header
 2022-04-29 16:50:11 +02:00
Laurent Destailleur
7616a55de5
Merge pull request #20726 from vold-lu/fixes/lines-array-error-reporting 
FIX: ModuileBuilder - Fix getLinesArray() error reporting
 2022-04-29 16:35:16 +02:00
Laurent Destailleur
47661d8d38
Merge pull request #20735 from atm-john/13.0_fix_missing_budget_export 
Fix :  missing project budget field in Dolibarr V13 export wizard
 2022-04-29 16:06:30 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
Aloïs Micard
fb7f0545e4 Fix error reporting in getLinesArray() 2022-04-27 17:56:31 +02:00
daraelmin
5387a8e953
FiX miss spelling 2022-04-26 19:07:31 +02:00
Florian HENRY
3d4bd1e155 FIX: truncate Customer Reference too long on PDF header (PR #20718) 2022-04-26 16:53:40 +02:00
Florian HENRY
399addfb03 mor docs 2022-04-26 16:40:27 +02:00
Florian HENRY
c00a56bee3 fix: truncate too long Ref Customer in PDF Header 2022-04-26 16:39:06 +02:00
stickler-ci
6a1d4c2255 Fixing style errors. 2022-04-25 20:36:34 +00:00
daraelmin
694bcda3bb Fix #20712 - No more empty wrong line added in bookkeeping confirme_create mode 2022-04-25 22:26:25 +02:00
Gauthier PC portable 024
ca0f98d09f FIX : label tax cat trad 2022-04-22 13:50:39 +02:00
Laurent Destailleur
4d1eed7dc1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
 2022-04-14 23:28:26 +02:00
Laurent Destailleur
6bbf4ccaaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:25:04 +02:00
Laurent Destailleur
fb0a38d248 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:24:09 +02:00
Laurent Destailleur
694357d48e
Merge pull request #19420 from marc-dll/12.0_FIX_project_activity_default_workingdays 
FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
 2022-04-14 23:23:12 +02:00
Laurent Destailleur
110fa251e8
Merge pull request #19425 from marc-dll/13.0_FIX_project_timesheet_offdays_offset 
FIX: project timesheet: public holidays offset by 1 day
 2022-04-14 23:22:05 +02:00
Laurent Destailleur
b5bf660fc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:43 +02:00
Laurent Destailleur
031669493d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:35 +02:00
Laurent Destailleur
4feb2c3b83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:02:16 +02:00
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length 
FIX: user employee tab: offset in open days messes up holiday length calculation
 2022-04-14 22:59:20 +02:00
Laurent Destailleur
e0f8f5d035
Merge pull request #20608 from fmarcet/13.0 
Fix: Direct download don't work with multicompany
 2022-04-14 22:15:16 +02:00
Laurent Destailleur
ada8585921
Merge pull request #20611 from atm-kevin/FIX_Salaries_Payment_Entity 
FIX : Add missing entity on salary's payment
 2022-04-14 21:46:10 +02:00
Laurent Destailleur
02a3cfbb5f
Update paymentsalary.class.php 2022-04-14 21:43:55 +02:00
Laurent Destailleur
074f96a34e
Merge pull request #20637 from atm-arnaud/FIX_inter_entity 
FIX intervention entity missing
 2022-04-14 20:50:18 +02:00
atm-arnaud
0fcfb7c5fd FIX intervention entity missing 2022-04-14 12:08:06 +02:00
Laurent Destailleur
6a7212a48d Fix sql error 2022-04-12 22:02:46 +02:00
Laurent Destailleur
a776caf7a4
Merge pull request #20614 from atm-kevin/FIX_Missing_Entity_NEW_VAT 
FIX : Missing entity on adding new VAT
 2022-04-12 16:29:48 +02:00
Laurent Destailleur
1bfd9c695f
Update tva.class.php 2022-04-12 16:29:25 +02:00
stickler-ci
adda436dab Fixing style errors. 2022-04-12 12:45:05 +00:00
kevin
c51aff99af Add missing entity on adding new VAT 2022-04-12 14:38:17 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
cb367f7787
Merge pull request #20606 from vold-lu/translate_permission_label 
NEW: ModuileBuilder - Translate permissions label
 2022-04-12 03:02:24 +02:00
Laurent Destailleur
6005f0e08b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-11 20:57:27 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 20:57:16 +02:00
Laurent Destailleur
155dfbda94 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-11 20:43:50 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/card.php
 2022-04-11 20:43:20 +02:00
Ferran Marcet
62b7496253 Fix: Direct download don't work with multicompany 2022-04-11 18:26:49 +02:00
Aloïs Micard
89b7c8298b Module builder: Translate permissions label 2022-04-11 17:25:45 +02:00
Laurent Destailleur
7ccbd34c2d
Merge pull request #20587 from marc-dll/13.0_FIX_holiday_mails_in_html 
FIX: holiday/leave requests: write status change emails in HTML
 2022-04-11 16:29:13 +02:00
Laurent Destailleur
8b6ad766d6
Merge pull request #20605 from Easya-Solutions/14.0_fix-replenish-stock-by-warehouse 
FIX replenish and manage product stock by warhouse
 2022-04-11 16:23:52 +02:00
lvessiller
18488cf1dd FIX replenish and manage product stock by warhouse 2022-04-11 13:53:35 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
099e7aaeb5
Merge pull request #20532 from OPEN-DSI/fix_add_line_when_create_invoice 
FIX - Fix the adding of lines in the create invoice functions
 2022-04-08 15:33:35 +02:00
Laurent Destailleur
75b66eace0
Merge pull request #19417 from atm-adrien/FIX_commandeFourn_Stats 
FIX : Supplier order stats
 2022-04-07 18:35:10 +02:00