Commit Graph

96128 Commits

Author SHA1 Message Date
Alexandre SPANGARO
3f832c1c5d FIX Accountancy - Export format FEC - Prevent tab in label with the formats for which it is the separator 2022-04-27 04:46:09 +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
Alexandre SPANGARO
8d3c2e34f4 FIX Check field accountancy code customer is mandatory in mass action 2022-04-26 11:46:00 +02:00
matll42
8980b2e6c0 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-25 19:54:08 -04:00
Laurent Destailleur
134113db64 Fix upload of doc for purchase orders 2022-04-26 01:00:10 +02:00
Laurent Destailleur
8de9d63f7d FIX Numbering of sepa files 2022-04-26 00:35:20 +02:00
Laurent Destailleur
fb1c770568 Doc 2022-04-25 23:37:34 +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
stickler-ci
7f1d5fa867 Fixing style errors. 2022-04-25 12:43:58 +00:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
BENKE Charlene
752aaeb275
fix : allow cut&paste as real numeric value to excel 2022-04-25 14:07:48 +02:00
Francis Appels
40da139225 Add hook massaction to reception list. 2022-04-25 13:58:33 +02:00
Francis Appels
e9cfb9b69c Improve error handling confirm_billcreate 2022-04-25 11:24:09 +02:00
Francis Appels
e6ce81bf8b Move confirm_createbills mass action to order list 2022-04-25 11:20:00 +02:00
Regis Houssin
7e7ae863c7 FIX syntax error 2022-04-25 10:19:52 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Francis Appels
8bb9cc83eb Fix migration warning. 2022-04-25 09:30:05 +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
Nicolas SILOBRE
5eb74772d6
Update pdf_rouget.modules.php
Correction of units in the total weight
2022-04-23 03:41:17 +02:00
stickler-ci
9fd3a4b2c9 Fixing style errors. 2022-04-22 13:30:43 +00:00
Eric Seigne
72ac1fdfd2 fix #20690: add lang filter for companies 2022-04-22 15:28:48 +02:00
Eric Seigne
d2ec1efb42 fix #20690: add lang filter for people 2022-04-22 15:28:36 +02:00
Gauthier PC portable 024
6f9f78af33 FIX : var name 2022-04-22 14:28:43 +02:00
Gauthier PC portable 024
609ef9bfa7 FIX : var name 2022-04-22 14:26:16 +02:00
Gauthier PC portable 024
ca0f98d09f FIX : label tax cat trad 2022-04-22 13:50:39 +02:00
lvessiller
2992b3e845 NEW send last document in mass mailing action 2022-04-22 09:24:23 +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
fred1201
d9521d40e4 Update index.php
Replace call function
text( ) by html() to fix display in take post  when spécial caracter are store in database:

éèà become éàè
2022-04-21 07:39:51 +02:00
melina
db3edba578 Delete comments 2022-04-20 14:51:55 +02:00
melina
c23ed7c47b Add hooks completeJSProductDisplay 2022-04-20 14:47:36 +02:00
melina
6788cd179c Add hooks completeAjaxReturnArray 2022-04-20 12:01:17 +02:00
altairis-melina
ea2e1c0ff2
Merge branch 'develop' into productinstock 2022-04-20 09:59:10 +02:00
melina
0faec59f56 FIX conflict and integrate Lionel fix 2022-04-20 08:13:01 +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
Alexandre SPANGARO
1e96cd636f FIX Accountancy - Missing language key 2022-04-19 22:38:42 +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
lvessiller
68cfe61fb8 FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos 2022-04-19 17:59:59 +02:00
stickler-ci
aa36e396a3 Fixing style errors. 2022-04-18 22:23:44 +00:00
Yoan Mollard
37ab728846 Allow users to switch on e-mail headers again in UI 2022-04-19 00:13:40 +02:00
Yoan Mollard
bf5076e181 set MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER to TRUE by default
This is way more readable
2022-04-19 00:13:40 +02:00
Yoan Mollard
d5361c3147 Improved default signature for tickets 2022-04-19 00:13:40 +02:00
Yoan Mollard
cbdf74e00c i18n the default email collector descriptions 2022-04-19 00:13:40 +02:00
Yoan Mollard
ad0199afd1 Rephrased ticket labels 2022-04-19 00:13:40 +02:00
Yoan Mollard
7f27b8c499 Use default e-mail sender/notif/body/signature for tickets if they exist
Otherwise, when params have not been configured, error message due to an
empty "from e-mail" is unclear
2022-04-19 00:13:40 +02:00
Yoan Mollard
ed7044e018 Missing files.lib.php for dol_is_dir 2022-04-19 00:13:40 +02:00
Lenin Rivas
8caa45ee80
Show only code multicurrency in lists 2022-04-18 12:22:29 -05:00
Alexandre SPANGARO
ffd9693b17 NEW Add an option to show quick add feature 2022-04-18 07:35:05 +02:00
Alexandre SPANGARO
9a59362da2 Fix proper links for the Quick add feature 2022-04-18 07:18:02 +02:00
Laurent Destailleur
25fbd3b385 Fix missing field 2022-04-16 13:28:38 +02:00
Laurent Destailleur
140f983ca7 Fix look and feel v16 for the Quick add feature. 2022-04-15 18:04:58 +02:00
Regis Houssin
cc9c49afc9 TODO ICS is not used with bank transfer 2022-04-15 16:40:41 +02:00
Frédéric FRANCE
34409144b3
Update agenda.lang 2022-04-15 16:24:54 +02:00
Regis Houssin
81f0aedc8f FIX SEPA ICS is not mandatory for bank transfer 2022-04-15 16:17:03 +02:00
Frédéric FRANCE
dea1465fc7
add context 2022-04-15 14:44:19 +02:00
lmarcouiller
a77ae1ecd9 fix style errors 2022-04-15 14:31:59 +02:00
lmarcouiller
1ccf209c47 Close #20653 : edit discount pourcentage 2022-04-15 14:31:44 +02:00
Laurent Destailleur
8c808ea5f5 Label 2022-04-15 14:31:00 +02:00
Laurent Destailleur
0960320cf8 Fix missing icon in mass action 2022-04-15 14:27:53 +02:00
stickler-ci
8f397a3809 Fixing style errors. 2022-04-15 12:25:22 +00: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
Gauthier PC portable 024
2aee60ad59 NEW : expense report payments list 2022-04-15 12:14:41 +02:00
Florian HENRY
292df417fe NEW: Add column template invoice in invoice list 2022-04-15 11:32:53 +02:00
Florian HENRY
b4fb6cf527 fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL 2022-04-15 09:13:41 +02:00
Laurent Destailleur
a4b16c5b38 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:38:42 +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
3e5f84b6cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:15:05 +02:00
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +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
252888fc11
Merge pull request #20483 from hregis/fix_avoid_cookie_warning_missing_samesite
FIX avoid warning for missing cookie samesite params (and more secure)
2022-04-14 22:48:44 +02:00
Laurent Destailleur
75d3b3527c
Update main.inc.php 2022-04-14 22:45:56 +02:00
Laurent Destailleur
06f112d3ce
Update main.inc.php 2022-04-14 22:43:43 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf
New hidden conf to manage pmp on inventory
2022-04-14 22:42:35 +02:00
Laurent Destailleur
1438da022d
Merge pull request #20157 from atm-GregM/updateButtonsGregM
FIX: replace button with dolGetButtonAction on Societe card
2022-04-14 22:37:59 +02:00
Laurent Destailleur
aee0c8afc6
Merge pull request #20612 from vold-lu/add_tabs_in_module_builder
NEW: ModuileBuilder - Add tabs view in module builder
2022-04-14 22:17:51 +02:00
Laurent Destailleur
0023850c9a
Update api_documents.class.php 2022-04-14 22:16:17 +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
Philippe GRAND
d62d24a337 add code to get documents list by knowledgemanagement with api 2022-04-14 21:47:35 +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
c4a96957af
Merge pull request #20613 from Hystepik/develop#1
NEW #20609 : new massaction to assign a sale representatives on a selection of thirdparties
2022-04-14 21:37:20 +02:00
Laurent Destailleur
0145fbebb6
Merge pull request #20626 from bb2a/formquestion-clone-order-or-propal
FIX - add morecss select_compagny
2022-04-14 21:05:09 +02:00
Laurent Destailleur
7636c5109d
Merge pull request #20635 from Hystepik/develop#5
Fix : add of unique(entity,label) in llx_takepos_floor_tables table
2022-04-14 21:04:24 +02:00
Laurent Destailleur
fa010f401a
Merge pull request #20639 from FHenry/dev_new_date_sign_in_propal_list
NEW: Add column date Signature on propal list
2022-04-14 21:03:43 +02:00
Laurent Destailleur
6075b627a3
Merge pull request #20633 from Easya-Solutions/fix-stockcorrection-include-tpl-path
FIX include tpl path in product stock
2022-04-14 21:03:15 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2022-04-14 16:10:23 +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
Laurent Destailleur
3d21023110 Label of option 2022-04-14 14:11:40 +02:00
Florian HENRY
f15438dd03 NEW: data sign on propal list 2022-04-14 12:28:51 +02:00
atm-arnaud
0fcfb7c5fd FIX intervention entity missing 2022-04-14 12:08:06 +02:00
lmarcouiller
c90d758b0f New : add of unique(entity,label) 2022-04-14 11:06:54 +02:00
lvessiller
5f7f9a7515 FIX include tpl path in product stock 2022-04-14 09:48:06 +02:00
Laurent Destailleur
90366b1b81
Revert "NEW : Import with select boxes" 2022-04-13 16:21:25 +02:00
BB2A Anthony Berton
d154696c32 morecss select_compagny 2022-04-13 16:15:07 +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
914b037a9a Fix regression: bad cache management of linked object loading. 2022-04-12 22:35:12 +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
Laurent Destailleur
04ad919a2c Debug modulebuilder for v16. 2022-04-12 15:51:46 +02:00
Laurent Destailleur
386b8bee5e Fix deletion/creation of extrafields. 2022-04-12 15:26:21 +02:00
Laurent Destailleur
599c90ae6b FIX dol_string_onlythesehtmltags can keep html comments 2022-04-12 14:57:12 +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
b1cc271ad5 Fix trans 2022-04-12 14:23:39 +02:00
Aloïs Micard
36372b250c
Merge branch 'develop' into add_tabs_in_module_builder 2022-04-12 14:12:41 +02:00
lmarcouiller
d41676cf8b Close #20609 : new massaction asign sale representative 2022-04-12 13:57:00 +02:00
Laurent Destailleur
a006eaecde Fix trans 2022-04-12 13:02:33 +02:00
Aloïs Micard
752cc6f4a7 Lint source code 2022-04-12 11:17:24 +02:00
Aloïs Micard
a747f574b3 Improve comment 2022-04-12 11:15:40 +02:00
Aloïs Micard
25a851ac70 Fix translation 2022-04-12 11:12:43 +02:00
Aloïs Micard
a6407257dd Allow to view tabs in module builder 2022-04-12 11:11:26 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
98c7139859 Fix regression on fetchObjectLinked when used in loop on a static object 2022-04-12 10:34: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
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
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
8f3335f75d CSS 2022-04-11 21:17:35 +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
Laurent Destailleur
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +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
Laurent Destailleur
8b7e790130
Merge pull request #19677 from Hystepik/develop#1
NEW : Import with select boxes
2022-04-11 17:35:23 +02:00
Laurent Destailleur
770a0fbe8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-11 17:34:40 +02:00
Laurent Destailleur
480fda43c5 Clean code 2022-04-11 17:34:19 +02:00
Aloïs Micard
89b7c8298b Module builder: Translate permissions label 2022-04-11 17:25:45 +02:00
Laurent Destailleur
139c5a4327
Merge pull request #19518 from 1ocate/1ocateAddShipmentclose
NEW Mass action close shipment
2022-04-11 16:49:34 +02:00
Laurent Destailleur
af5444dc91 FIX ref not set in message of closing shipment 2022-04-11 16:48:56 +02:00
Laurent Destailleur
7028e82cf7
Merge pull request #20551 from Easya-Solutions/new-common-generate-document-show-errors
NEW display errors in a message box after generating documents
2022-04-11 16:33:58 +02:00
stickler-ci
ddb50264ae Fixing style errors. 2022-04-11 13:58:59 +00:00
Quentin VIAL-GOUTEYRON
67e7c91c3e pmp inventory conf MAIN_PRODUCT_PERENTITY_SHARED 2022-04-11 15:47:38 +02:00
Laurent Destailleur
dd6238cb2d Try to save on fetch 2022-04-11 15:24:39 +02:00
Laurent Destailleur
751b9efcd9
Merge pull request #20600 from javierybar/develop
FIX Tax 2 is lost when order is invoiced
2022-04-11 15:22:28 +02:00
lvessiller
18488cf1dd FIX replenish and manage product stock by warhouse 2022-04-11 13:53:35 +02:00
Laurent Destailleur
9386a0503e Fix update note 2022-04-11 02:09:24 +02:00
Laurent Destailleur
40720fad25 Fix php8 compatibility 2022-04-11 02:01:32 +02:00
javierybar
d7da57960f
FIX Tax 2 is lost when order is invoiced 2022-04-10 15:33: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
631d2da6b3 Fix php8 2022-04-09 03:26:38 +02:00
Laurent Destailleur
c65b7fd2ff Fix regression php8 2022-04-09 02:51:40 +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
42f82486da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:59:19 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Laurent Destailleur
eecbc05bc3 Show amount into popup of payment 2022-04-09 00:06:02 +02:00
Laurent Destailleur
003bcd60fa FIX Add protection on bad input of payment on multicurrency invoices 2022-04-08 19:52:40 +02:00
Laurent Destailleur
0673a4826a FIX currency visible into tooltip 2022-04-08 17:13:41 +02:00
Laurent Destailleur
4ff8969bac
Merge pull request #19393 from atm-gauthier/NEW/addline_with_position_choice_develop
New/addline with position choice develop
2022-04-08 16:09:44 +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
0e3ed3bec9
Merge pull request #20564 from atm-kevin/NEW_Reverse_Movement_Product_Consumption
NEW : Reverse movement product consumption
2022-04-08 15:29:34 +02:00
Laurent Destailleur
6579e63622
Merge pull request #20594 from frederic34/patch-1
Update objectonoff.php
2022-04-08 15:20:17 +02:00
Laurent Destailleur
bedb08df50 Clean and debug online payment code 2022-04-08 15:15:55 +02:00
Frédéric FRANCE
284649fd4b
Update objectonoff.php 2022-04-08 13:35:21 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +02:00
Laurent Destailleur
1d879bc996 FIX numbering method when mask include {cccc} 2022-04-08 10:19:20 +02:00
kevin
6a8e3761c3 Resolve merge conflicts 2022-04-08 09:54:17 +02:00
kevin
68e60fe628 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Reverse_Movement_Product_Consumption 2022-04-08 09:51:41 +02:00
kevin
135e4f1768 Add tooltip to explain the trash action 2022-04-08 09:50:40 +02:00
Laurent Destailleur
5ea42825fb
Merge pull request #19362 from ptibogxiv/patch-451
NEW stripe element with more gateways
2022-04-08 09:45:22 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
1f73f19ff7 php8 2022-04-08 00:42:39 +02:00
Laurent Destailleur
994b500a68 PHP 8.0 compatibility 2022-04-08 00:14:29 +02:00
Laurent Destailleur
88066d3fca Clean data 2022-04-07 23:53:02 +02:00
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +02:00
Laurent Destailleur
623f15711d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-07 19:26:07 +02:00
Laurent Destailleur
e66b4a687d Close #19414 2022-04-07 19:23:45 +02:00
Laurent Destailleur
0e36097eba Save result of some methods into cached properties. 2022-04-07 19:16:50 +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
6ea8bd23ad
Merge pull request #20542 from ATM-Consulting/FIX_16.0_template_supplier_invoices_overlapping_conditions
FIX 16.0 - supplier invoice card creates two invoices instead of one
2022-04-07 18:26:40 +02:00
Laurent Destailleur
6f413e03d8
Merge pull request #20523 from ATM-Consulting/NEW_16.0_consistency_mechanism_for_trigger_names
NEW 16.0 - proposal for a prefix-based consistency mechanism for trigger names
2022-04-07 18:25:03 +02:00
Laurent Destailleur
27b3209f51
Merge pull request #20583 from altairisfr/sitfac
FIX : dont update object price on each iteration when updating situation on all lines
2022-04-07 18:23:45 +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
Laurent Destailleur
baa4608812 Debug v16 2022-04-07 18:16:06 +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
Laurent Destailleur
cbae64f9aa FIX Add a hack to fix a bug in jquery 3.6.0/select 2 2022-04-07 17:51:38 +02:00
Laurent Destailleur
746cec015b Fix remove warning on chartjs 3.5 2022-04-07 17:50:18 +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
lvessiller
e6a0ca5042 FIX errors to catch 2022-04-07 16:32:08 +02:00
Laurent Destailleur
a120f65521 FIX country not visible into list of states 2022-04-07 16:32:03 +02:00
Laurent Destailleur
96c866400f css 2022-04-07 16:05:55 +02:00
Laurent Destailleur
b8d19c9311 Debug v16 2022-04-07 15:59:50 +02:00
Christophe Battarel
56bfa20d70 FIX : dont update object price on each iteration when updating situation for all lines 2022-04-07 15:59:42 +02:00
Laurent Destailleur
637f73a833
Merge pull request #17966 from cfoellmann/quickadd
quickadd menu like bookmarks
2022-04-07 15:41:57 +02:00
Laurent Destailleur
3e5e74c687 Close #17632 2022-04-07 15:39:03 +02:00
Laurent Destailleur
a0380c262e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-07 15:34:07 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge
can merge products
2022-04-07 15:02:03 +02:00
Laurent Destailleur
bc7ad806e7 Try to fix a strange logic. 2022-04-07 15:01:20 +02:00
Laurent Destailleur
f2f2ce7d7c
Merge pull request #19555 from OPEN-DSI/fix-thirdparty-modify-tags-not-customer-prospect
FIX can modify tag in thirdparty card if const enabled
2022-04-07 14:45:59 +02:00
atm-florian
4ced0bac89 replace throw new Exception(…) with dol_print_error + exit 2022-04-07 14:39:14 +02:00
Laurent Destailleur
56d5df4387
Merge pull request #19997 from habot-it/pdf_pagefoot
Add options in function pdf_pagefoot of pdf.lib.php
2022-04-07 14:33:41 +02:00
atm-florian
5953c3cd38 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_16.0_consistency_mechanism_for_trigger_names 2022-04-07 14:33:22 +02:00
Laurent Destailleur
0d121148c0
Merge pull request #20534 from ATM-Consulting/NEW_optimize_PDF_generation
avoid fetch_objectlinked for each page of the document
2022-04-07 14:25:10 +02:00
Laurent Destailleur
10367f2cb1
Merge pull request #20536 from atm-jpb/NEW_Add_class_name_on_expensereport_rule
add class name on tds  expensereport rule card
2022-04-07 14:22:46 +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
27acaa45f5 Clean deprecated field 2022-04-07 14:18:24 +02:00
Laurent Destailleur
01f11ff5f4
Merge pull request #20550 from ATM-Consulting/FIX_16.0_deprecate_amount_field_on_facture_fourn
Fix 16.0 deprecate amount field on facture fourn?
2022-04-07 14:06:38 +02:00
Laurent Destailleur
3e477f9bbb
Merge pull request #20579 from atm-gauthier/NEW/Add_column_Total_HT_to_products_array_on_document_creation_card
NEW : identification tr by data-id
2022-04-07 14:04:22 +02:00
Laurent Destailleur
c3b3285340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-07 14:03:29 +02:00
Laurent Destailleur
4cac6b7e29 css 2022-04-07 14:03:14 +02:00
Laurent Destailleur
0ed7c643f8 Close #20547 2022-04-07 13:28:24 +02:00
Laurent Destailleur
485e163cf6 default value 2022-04-07 13:16:51 +02:00
Laurent Destailleur
a4b9883eac Use checkbox instead of combo to save clicks when adding a resource 2022-04-07 13:14:51 +02:00
Laurent Destailleur
10c9d6f361
Merge pull request #20552 from OnCloudDev/doli-patch-services-list
Fixed service list date filter
2022-04-07 11:44:18 +02:00
Laurent Destailleur
d718a93c82
Merge pull request #20553 from dolibit-ut/patch-386
Update README.md
2022-04-07 11:42:59 +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
Laurent Destailleur
133e86b903
Merge pull request #20566 from dolibit-ut/patch-387
Update interface_80_modStripe_Stripe.class.php
2022-04-07 11:35:40 +02:00
Laurent Destailleur
1b61c6e9ae
Merge pull request #20568 from dolibit-ut/patch-388
Update company.lib.php
2022-04-07 11:35:01 +02:00
Laurent Destailleur
06f8af71ef Code comment 2022-04-07 11:24:39 +02:00
Gauthier PC portable 024
93777f81f3 NEW : identification tr by data-id 2022-04-07 11:23:27 +02:00
Laurent Destailleur
5e8f632a9b Close #20571 2022-04-07 11:22:28 +02:00
Laurent Destailleur
3fbe727248 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-07 11:19:27 +02:00
Laurent Destailleur
a021309681
Merge pull request #20574 from atm-gauthier/NEW/Add_column_Total_HT_to_products_array_on_document_creation_card
New : add column total ht to products array on document creation card
2022-04-07 11:19:03 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +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
Laurent Destailleur
8a7e98e679
Merge pull request #20570 from dolibit-ut/patch-390
Update societe.class.php
2022-04-07 11:07:34 +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