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

90902 Commits

Author SHA1 Message Date
NASDAMI Quatadah
793e95d88c fixing bug (colspan should be int) 2022-06-09 14:04:32 +02:00
NASDAMI Quatadah
53bf6db23f commenting a line => resolves the bug 2022-06-09 13:46:04 +02:00
Laurent Destailleur
974a1c2c6d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-09 12:48:51 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
aeb4287d25
Merge pull request #21143 from fboitel/14.0 
FIX #20696
 2022-06-09 03:11:23 +02:00
Laurent Destailleur
900c71b5d6 Fix can add an empty line in tmp edit mode of transation 2022-06-09 03:07:11 +02:00
Laurent Destailleur
e10d89dd36 Fix regression 2022-06-09 03:00:51 +02:00
bagtaib
7a20b3dcec FIX #21140 
Conflicts:
	htdocs/societe/class/societe.class.php
 2022-06-09 02:52:54 +02:00
Faustin
f0a8765ee6 FIX #20696 2022-06-08 16:05:44 +02:00
daraelmin
0641b66118
Clean code 2022-06-08 01:39:53 +02:00
daraelmin
f872585ea2
Fix #21150 - Regression Can't insert manual lines 
Fix #21150 - Regression Can not insert manual lines for automatically created transactions to the general ledger, this was possible before.
 2022-06-08 01:02:02 +02:00
Faustin
b6724f6061 FIX #20696 2022-06-07 16:43:49 +02:00
Laurent Destailleur
309eccc426 Fix phpcs 2022-06-03 14:08:04 +02:00
Laurent Destailleur
f53060fec3 FIX selection of type of invoice 2022-06-02 19:43:41 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
10aa1a66bc Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:17 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
4e033ba576 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:34:32 +02:00
Laurent Destailleur
ed5b8df385 FIX Bank account not set when creating invoice from order 2022-06-02 19:34:16 +02:00
Alexandre SPANGARO
7b55676b56 Merge branch '14.0' into 14a35 2022-06-01 23:12:02 +02:00
Alexandre SPANGARO
1dcd4d0ab6 Typo in CSS class 2022-06-01 23:11:20 +02:00
Nicolas
4696cd33d5 fix for issue #16985 2022-06-01 10:42:29 +02:00
Laurent Destailleur
f5da6ebfe2
Merge pull request #21036 from OPEN-DSI/14.0_fix_show_category_on_sellist_extrafields 
FIX: Show sellist type of extrafield when none category selected
 2022-05-29 11:24:35 +02:00
kamel
f1914ff66f FIX: Show sellist type of extrafield when none category selected 2022-05-25 18:02:18 +02:00
Florian HENRY
4e289741f9 fix: extrafields chkbxlst or checkbox or badly displayed in line object 2022-05-25 16:59:23 +02:00
Laurent Destailleur
3ce58c2337
Merge pull request #21011 from OPEN-DSI/14.0_fix_get_origin_when_add_supplier_proposal 
FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
 2022-05-24 21:29:55 +02:00
Laurent Destailleur
6f83c8c6f3
Update productbatch.class.php 2022-05-24 21:22:14 +02:00
Laurent Destailleur
62a210d2a2
Merge pull request #21012 from OPEN-DSI/14.0_fix_card_errors_managment 
FIX: Fix show errors in card
 2022-05-24 21:08:38 +02:00
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
Laurent Destailleur
ab40634dcb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-24 16:28:32 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
 2022-05-24 16:27:26 +02:00
kamel
79462c43fa FIX: Fix get origin from other than supplier proposal when add a new supplier proposal 2022-05-24 15:13:19 +02:00
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
Laurent Destailleur
05d09f1ce9
Merge pull request #20981 from rycks/14_undef_ficheinter 
14 undef ficheinter
 2022-05-22 17:17:01 +02:00
Laurent Destailleur
460687504c
Update card.php 2022-05-22 17:16:48 +02:00
Laurent Destailleur
b5e0e57f9f
Merge pull request #20982 from rycks/14_fix_read_property_creer 
14 fix read property creer
 2022-05-22 17:15:56 +02:00
Laurent Destailleur
a193474fa3
Update card.php 2022-05-22 17:15:43 +02:00
Maxime Kohlhaas
c3fb7647c5 Fix delete customer payment 2022-05-22 02:30:35 +02:00
Eric Seigne
1ca1afd734 fix #18339 : Attempt to read property creer 2022-05-22 01:50:10 +02:00
Eric Seigne
45bc1ff287 fix #18339 : Attempt to read property creer 2022-05-22 01:50:01 +02:00
Eric Seigne
4a222fe5d5 fix potential warning ($conf->ficheinter->enabled) 2022-05-22 01:38:32 +02:00
Eric Seigne
c1473b5514 fix #18338: Undefined property $ficheinter 2022-05-22 01:28:14 +02:00
Maxime Kohlhaas
e5c38572d1 Fix no document available on job candidature 2022-05-22 00:23:16 +02:00
Laurent Destailleur
812298f740
Merge pull request #20945 from atm-maxime/fix_default_value_boolean 
Fix default value boolean
 2022-05-21 17:28:39 +02:00
Nicolas
d8a68d280e FIX missing morecss for multiselectarray 2022-05-21 17:06:36 +02:00
Maxime Kohlhaas
9b2a543170 Fix phpcs too long line 2022-05-21 15:49:27 +02:00
Maxime Kohlhaas
4932f86a2d Fix default value for boolean extrafield 2022-05-21 15:41:34 +02:00
Maxime Kohlhaas
4c10ef8f4c Fix labels in tickets widgets 2022-05-21 15:36:04 +02:00
Laurent Destailleur
6aa4ce2acb
Merge pull request #20896 from marc-dll/13.0_FIX_new_membership_select_width 
FIX: new member subscription: bank account and payment mode might be hidden
 2022-05-21 00:48:58 +02:00
Laurent Destailleur
1196d6f48c
Merge pull request #20907 from atm-quentin/NEW_hook_format_address 
FIX : hook for dol_format_address
 2022-05-21 00:42:11 +02:00
Maxime Kohlhaas
8231a9ea0f Fix wrong right test to show button 2022-05-20 23:29:35 +02:00
Laurent Destailleur
b184a1512f
Merge pull request #20909 from daraelmin/patch-2 
FIX regression PR #20713
 2022-05-20 23:24:34 +02:00
Laurent Destailleur
fcd70fa852
Merge pull request #20917 from inovea-conseil/FIX#20828 
FIX #20828
 2022-05-20 22:27:37 +02:00
Laurent Destailleur
d0030cd4f5
Merge pull request #20884 from Easya-Solutions/14.0-fix-pdf-squille-qyt-received-label-from-status 
FIX qty received label in Squille PDF model
 2022-05-20 21:40:16 +02:00
IC-Ilies
c08c86a9d8 FIX #20828 2022-05-20 17:52:53 +02:00
Quentin VIAL-GOUTEYRON
a2fe72225f NEW : hook for dol_format_address 2022-05-20 10:06:28 +02:00
daraelmin
3d734e8d34
FIX regression PR #20713 
Please do not revert with PR #20900
 2022-05-20 09:22:16 +02:00
Marc de Lima Lucio
25196fa709 FIX: new member subscription: bank account and payment mode might be hidden 2022-05-19 10:20:31 +02:00
Laurent Destailleur
180d94b43c More log 2022-05-17 20:31:50 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
kamel
aee6f408b2 FIX: Set datec when add time spent on a project task 2022-05-11 09:30:39 +02:00
Laurent Destailleur
8ef75ecc7c Better fix fox #20807 2022-05-10 15:27:43 +02:00
stickler-ci
017eb99e86 Fixing style errors. 2022-05-09 07:53:37 +00:00
Pierre Ardoin
ec00c6fef2
line deleted when updated after rapproched 
Fix an issue that deletes line when we update data after its rappro.
 2022-05-09 09:49:07 +02:00
Laurent Destailleur
b4e1bac32d
Merge pull request #20783 from fappels/14_fix_error_handling 
Fix errors.lang merge conflict and fix reception error handling
 2022-05-08 19:12:11 +02:00
Laurent Destailleur
a65e9f33db
Merge pull request #20793 from atm-gauthier/fix_salaries_payments_and_stats 
FIX : in salary stats and payment list, we must check right perms as well as salary list
 2022-05-08 19:11:54 +02:00
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated) 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
 2022-05-06 12:42:45 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Gauthier PC portable 024
2256f8811d FIX : in salary stats and payment list, we must check right perms as well as salary list 2022-05-06 11:24:53 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Francis Appels
10e13286d3 Add missing reception back to draft error handling 2022-05-05 11:08:17 +02:00
Francis Appels
29d1424413 fix merge conflict 
Add missing error translation key
 2022-05-05 11:07:39 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
Laurent Destailleur
0cc3eec599 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-03 11:55:45 +02:00
Laurent Destailleur
36fdee3337 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-05-03 11:54:57 +02:00
Laurent Destailleur
a254412c61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
 2022-05-03 11:54:28 +02:00
Laurent Destailleur
cc1a3080d0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-05-03 11:53:23 +02:00
Laurent Destailleur
b5f887b3e4 Fix DEBUGBAR_USE_LOG_FILE 2022-05-03 11:52:32 +02:00
Laurent Destailleur
971714f8e3 phpcs 2022-05-01 20:46:23 +02:00
Laurent Destailleur
e811fbb75b
Merge pull request #20660 from hregis/fix_backport_and_ics_not_mandatory_with_bank_transfer 
FIX SEPA ICS is not mandatory for bank transfer
 2022-05-01 13:47:35 +02:00
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
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
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
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
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
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
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
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
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
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
Gauthier PC portable 024
f1771af53c FIX : originproductline array td identification data-id 2022-04-07 11:03:25 +02:00
Gauthier PC portable 024
9ffe82e259 FIX : originproductline array td identification 2022-04-07 10:32:23 +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
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
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
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
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