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

94415 Commits

Author SHA1 Message Date
daraelmin
694bcda3bb Fix #20712 - No more empty wrong line added in bookkeeping confirme_create mode 2022-04-25 22:26:25 +02:00
Laurent Destailleur
97328f732e Fix error managemnt when getting RSS. 2022-04-24 23:02:53 +02:00
Laurent Destailleur
16c607f4d8 Fix responsive 2022-04-24 18:55:52 +02:00
Gauthier PC portable 024
ca0f98d09f FIX : label tax cat trad 2022-04-22 13:50:39 +02:00
Regis Houssin
2a5c54d4e4 FIX compatibility for ticket number sharing 2022-04-21 16:02:41 +02:00
Regis Houssin
8878eb6d76 FIX compatibility with multicompany sharings 2022-04-21 14:52:06 +02:00
Regis Houssin
731d85130c FIX missing hook parameter 2022-04-21 09:49:00 +02:00
Laurent Destailleur
ad7fcd264b FIX Tabulation must be allowed for HTML content 2022-04-19 23:39:09 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install 
Fix user photo when gravatar not reachable
 2022-04-19 22:26:27 +02:00
HENRY Florian
9acb1b2f88
Update 14.0.0-15.0.0.sql 2022-04-16 11:14:04 +02:00
Regis Houssin
cc9c49afc9 TODO ICS is not used with bank transfer 2022-04-15 16:40:41 +02:00
Regis Houssin
81f0aedc8f FIX SEPA ICS is not mandatory for bank transfer 2022-04-15 16:17:03 +02:00
Laurent Destailleur
8bc4e9082c
Merge pull request #20647 from FHenry/15.0_fix_html_PRODUCT_LOT_ENABLE_QUALITY_CONTROL 
fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL
 2022-04-15 13:22:31 +02:00
Florian HENRY
bed974ebae Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15.0_fix_createtable_without_migration_script 2022-04-15 10:22:33 +02:00
Florian HENRY
24bb6c6f83 fix: clean mess up around element_tag table 2022-04-15 10:20:52 +02:00
Florian HENRY
b4fb6cf527 fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL 2022-04-15 09:13:41 +02:00
Laurent Destailleur
4bf918065b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:29:00 +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
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +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
909766828e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:25 +02:00
Laurent Destailleur
ae412d37ed Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:16 +02:00
atm-arnaud
0fcfb7c5fd FIX intervention entity missing 2022-04-14 12:08:06 +02:00
Laurent Destailleur
c968b872e4
Merge pull request #20619 from fmarcet/15.0 
Fix: The resource dropdown does not show the values
 2022-04-13 12:14:56 +02:00
Laurent Destailleur
29242a23c3
Update product.class.php 2022-04-13 12:11:35 +02:00
Norbert Penel
e9e10e84b2
ensure priority in this usage 
ensure priority in this usage
 2022-04-13 10:47:33 +02:00
Laurent Destailleur
6a7212a48d Fix sql error 2022-04-12 22:02:46 +02:00
Laurent Destailleur
5e76c1a45d Fix doc 2022-04-12 21:59:34 +02:00
Ferran Marcet
ed172421f0 Fix: The resource dropdown does not show the values 2022-04-12 19:20:45 +02:00
Ferran Marcet
6cbcc54bd9 Fix: The resource dropdown does not show the values 2022-04-12 19:19:41 +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
Laurent Destailleur
a006eaecde Fix trans 2022-04-12 13:02:33 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
4da7883a9a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-12 10:05:27 +02:00
Regis Houssin
2d56aed912 FIX uniformize code 2022-04-12 08:31:51 +02:00
Regis Houssin
c4747735b9 FIX missing signature library when ODT model is used 2022-04-12 07:55:09 +02:00
Laurent Destailleur
cfe554b04c Fix var not defined 2022-04-12 03:08:31 +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
356ef3373f
Merge pull request #20607 from fmarcet/15.0 
Fix: Online signature of proposals does not work well with multicompany
 2022-04-12 02:57:26 +02:00
Laurent Destailleur
f679392d26 FIX missing picto in combo of mass actions of thirdparties. 2022-04-12 02:26:37 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +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
b8bccd62ef
Update newonlinesign.php 2022-04-11 18:41:36 +02:00
Ferran Marcet
62b7496253 Fix: Direct download don't work with multicompany 2022-04-11 18:26:49 +02:00
Ferran Marcet
9547b9e7fe Fix: Online signature of proposals does not work well with multicompany 2022-04-11 18:01:25 +02:00
Aloïs Micard
89b7c8298b Module builder: Translate permissions label 2022-04-11 17:25:45 +02:00
lvessiller
18488cf1dd FIX replenish and manage product stock by warhouse 2022-04-11 13:53:35 +02:00
Laurent Destailleur
da0fcb556f Fix css 2022-04-09 15:28:01 +02:00
Laurent Destailleur
1aecff854b Fix missing limit in redirect 2022-04-09 14:40:29 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +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
Laurent Destailleur
ee66869c4c
Merge pull request #20584 from marc-dll/14.0_FIX_holiday_list_end_shift 
FIX: action comm list: holiday last day not included + handle halfdays
 2022-04-07 18:19:56 +02:00
Marc de Lima Lucio
de737b6b23 FIX: holiday/leave requests: write status change emails in HTML 2022-04-07 18:07:30 +02:00
Marc de Lima Lucio
6e0888ca0e FIX: action comm list: holiday last day not included + handle duration with halfdays 2022-04-07 17:17:20 +02:00
Adrien Raze
41ee9739db FIX: Add 'recruitment' into check array 2022-04-07 17:16:02 +02:00
Laurent Destailleur
37fbe859df FIX country not visible into list of states 2022-04-07 16:33:19 +02:00
Laurent Destailleur
d26c578e97
Merge pull request #20541 from FHenry/14.0_fix_bithday_date_displayed 
fix: Bad dirthday displayed date (d-1) in the Bithday Widget
 2022-04-07 14:22:15 +02:00
Laurent Destailleur
11b0d7ba6f
Merge pull request #20559 from FHenry/14.0_fix_token_referentObject_page 
FIX: Filter on Object Referent page give CRSF page
 2022-04-07 11:37:41 +02:00
UT from dolibit
ed9435321f Update societe.class.php 
note_public  => NotePublic
note_private => NotePrivate

see #20419
 2022-04-07 11:08:30 +02:00
Gauthier PC portable 024
f1771af53c FIX : originproductline array td identification data-id 2022-04-07 11:03:25 +02:00
Laurent Destailleur
cc1ee0258b
Merge pull request #20577 from FHenry/15.0_fix_modulebuilder 
fix: bad permission int modulebuilder template
 2022-04-07 11:01:59 +02:00
Gauthier PC portable 024
9ffe82e259 FIX : originproductline array td identification 2022-04-07 10:32:23 +02:00
Florian HENRY
291002fe11 fix: bad poermission int modulebuilder template 2022-04-07 10:31:54 +02:00
Laurent Destailleur
afdefad55b FIX bad link to add a customer price (token duplicated) 2022-04-06 21:01:04 +02:00
Laurent Destailleur
32875a1e6c Fix trans 2022-04-06 17:06:49 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
33b5605a72 Code comment 2022-04-06 16:49:59 +02:00
Laurent Destailleur
5a8d5618f2 Fix error message on IBAN/BIC validation 2022-04-06 16:15:34 +02:00
Laurent Destailleur
0b8f4489c8 css 2022-04-06 15:55:43 +02:00
Laurent Destailleur
2e91b0107a Fix missing data in tooltip 2022-04-06 15:35:49 +02:00
Laurent Destailleur
c2f2f98235 css 2022-04-06 15:25:37 +02:00
Laurent Destailleur
1988459aa8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-06 14:54:02 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
Florian HENRY
7b36733690 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_bithday_date_displayed 2022-04-06 13:49:22 +02:00
Laurent Destailleur
c3ae63f587 FIX out of memory when more than 100 000 invoices. 2022-04-06 11:34:49 +02:00
Florian HENRY
c4f0c60a11 FIX: Filter on Object Referent page give CRSF page 2022-04-06 09:19:56 +02:00
Laurent Destailleur
91909928d4 FIX Can't edit bank record 2022-04-05 18:19:06 +02:00
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Laurent Destailleur
f0d163a4ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-05 15:28:54 +02:00
Laurent Destailleur
8e4c89673a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2022-04-05 15:28:43 +02:00
Laurent Destailleur
04ece4f792
Merge pull request #20531 from ATM-Consulting/FIX_condition_on_remx 
FIX : Bad condition on remx
 2022-04-05 14:53:25 +02:00
Laurent Destailleur
3c64965f9c
Merge pull request #20535 from altairis-noe/14.0 
FIX backport
 2022-04-05 14:19:33 +02:00
bomuux
63016b79ea Bug: Cannot set thirdparty customer accountancy code to empty string 
When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation :
code_compta to code_compta_client
 2022-04-05 14:06:52 +02:00
Gauthier PC portable 024
b199234afe FIX : each time we create a supplier order, we need to give it a ref_supplier 2022-04-05 12:01:09 +02:00
Florian HENRY
1fec350ccc fix: Bad dirthday displayed date (d-1) in the Bithday Widget 2022-04-04 22:51:30 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
Laurent Destailleur
2913759bb7 Fix syntax 2022-04-04 10:45:50 +02:00
kamel
6cac982507 FIX - Fix the adding of lines in the create invoice functions 2022-04-04 10:32:17 +02:00
Atm-Gregr
2009cc96e0 clean branch 2022-04-04 10:21:06 +02:00
Atm-Gregr
53b185ce9c fix condition on remx 2022-04-04 10:19:51 +02:00
Atm-Gregr
e34c921f8b Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2022-04-04 10:19:18 +02:00
Laurent Destailleur
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/accounting-files.php
 2022-04-03 17:27:15 +02:00
Laurent Destailleur
440b5350df # WARNING: head commit changed in the meantime 
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
 2022-04-03 17:19:27 +02:00
Laurent Destailleur
ece9f3037a
Merge pull request #19788 from OPEN-DSI/v12-fix-user-card-modify-transverse-rights 
FIX user actions rights when multi-company transverse mode is enabled
 2022-04-02 18:15:50 +02:00
Laurent Destailleur
06689a3fce
Merge pull request #20520 from OPEN-DSI/14.0_fix_default_options_when_generate_pdf_in_massactions 
FIX - Fix default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions
 2022-04-02 16:32:11 +02:00
Laurent Destailleur
796164d637
Merge pull request #20509 from atm-gauthier/14.0_fix_no_unset_fields_afteer_updateline_expensereport 
FIX : Missing unset fields after updateline expensereport
 2022-04-02 16:30:38 +02:00
Laurent Destailleur
d4accb97c5 FIX #yogosha9754 2022-04-02 15:26:40 +02:00
Laurent Destailleur
9c00115abe FIX #yogosha9754 2022-04-02 14:32:53 +02:00
kamel
11d4e85a39 FIX - Fiw default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions 2022-04-01 16:52:59 +02:00
Laurent Destailleur
0c27578e69
Merge pull request #20233 from marc-dll/13.0_FIX_clone_with_unique_extrafields 
FIX: object cloning: set unique extrafield values to null to prevent duplicates
 2022-04-01 14:49:25 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
ad8e0a3be5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:36 +02:00
Laurent Destailleur
6e4ed58be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:26 +02:00
Laurent Destailleur
05e1957627 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-01 13:30:31 +02:00
Laurent Destailleur
4c150d85c9 Doc 2022-04-01 13:23:45 +02:00
Laurent Destailleur
86e9a24eb3
Merge pull request #20507 from FHenry/14_fix_action_reminders 
FIX on update with action reminder in future there is user key error
 2022-04-01 13:21:05 +02:00
Laurent Destailleur
106e3072dc
Update card.php 2022-04-01 13:20:40 +02:00
Laurent Destailleur
0948a88d52
Merge pull request #20508 from FHenry/15.0_fix_message_inventories_lot_series 
fix: Show error message on inventory input line for serial num product #Evarisk
 2022-04-01 13:16:37 +02:00
stickler-ci
d188f44a4c Fixing style errors. 2022-04-01 07:58:41 +00:00
Gauthier PC portable 024
fa0e7a641c FIX : Missing unset fields after updateline expensereport 2022-04-01 09:52:16 +02:00
Florian HENRY
0c44f164c7 fix: Show error message on inventory input line for serial num product 2022-04-01 09:38:06 +02:00
Florian Mortgat
5df5050418
Apply suggestions from code review 
replace spaces with tabs
 2022-04-01 09:14:04 +02:00
Florian HENRY
e7db103b57 fix: on update with action reminder in future there is user key error 2022-03-31 18:55:54 +02:00
atm-florian
ce83fa9f7e FIX missing call to executeHooks() 2022-03-31 17:34:24 +02:00
Laurent Destailleur
800080c06f FIX Navigation between invoices 2022-03-30 18:42:17 +02:00
kamel
a22450391f FIX - Fix search by filters 2022-03-30 15:50:36 +02:00
Laurent Destailleur
4e81de2a4a
Merge pull request #20485 from atm-gauthier/FIX_ref_supplier_on_bill_several_fourn_orders_case 
FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders
 2022-03-30 15:16:12 +02:00
Gauthier PC portable 024
684e816ac3 FIX : incrementation 2022-03-30 14:12:16 +02:00
Laurent Destailleur
c37e2756b1
Merge pull request #20490 from fmarcet/15.0 
Fix: Sales representative column crash on invoice list
 2022-03-30 12:43:13 +02:00
Laurent Destailleur
14d8c1045d
Merge pull request #20056 from aspangaro/14p32 
FIX Disable customer type by default if type prospect/customer is disabled
 2022-03-30 12:17:44 +02:00
Laurent Destailleur
e93f1cc507
Update card.php 2022-03-30 12:15:33 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
Laurent Destailleur
fe381ef02e Fix default value of typeent on thirdparty creation. 2022-03-30 10:14:28 +02:00
Gauthier PC portable 024
6480877b99 FIX : We need to have a different default_ref_supplier for each new fourn invoice 2022-03-30 10:01:17 +02:00
Ferran Marcet
f8b457e61c Merge branch '15.0up' into 15.0 2022-03-30 09:34:28 +02:00
Ferran Marcet
dd20907d53 Fix: Sales representative column crash on invoice list 2022-03-30 09:33:14 +02:00
Gauthier PC portable 024
b7e7c95d2a FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders 2022-03-29 16:02:39 +02:00
Laurent Destailleur
a221b17809 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/compta/facture/class/facture.class.php
 2022-03-29 15:50:25 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
5f2ba49dfa Fix regression 2022-03-29 15:20:36 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00