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

96128 Commits

Author SHA1 Message Date
Laurent Destailleur
3780e83615 Trans 2022-04-29 13:20:14 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all   entities. 2022-04-29 13:10:28 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
Laurent Destailleur
bdd9b2acf4 Clean css 2022-04-29 12:36:38 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
Christophe Battarel
d682cb3103 please Travis 2022-04-29 11:09:32 +02:00
Christophe Battarel
812b9adee7 still trying to please Travis... losing my time 2022-04-29 10:58:04 +02:00
Quentin-Seekness
726b899d30
FIX: Delete an extrafield where type is double 
Found the bug on a propal's extrafield, it was impossible to delete a decimal extrafield.  In updateExtraField() the $value stayed "" where it needed to be null.
The same issue can be found in insertExtraFields().
 2022-04-29 10:45:08 +02:00
melina
407efccd55 Merge branch 'productinstock' of github.com-melina:altairis-melina/dolibarr into productinstock 2022-04-29 10:44:15 +02:00
melina
6d79d03cb2 add comment to fix stickler 2022-04-29 10:43:35 +02:00
Christophe Battarel
a11b5b4399 escape sql string for my Travais friend 2022-04-29 10:12:53 +02:00
Christophe Battarel
fb076a9282 FIX pagination on search results 2022-04-29 10:00:25 +02:00
Christophe Battarel
78f46bb98b search next or previous page of products if asked 2022-04-29 09:49:10 +02:00
Christophe Battarel
accb900d4f ajax load only one page of search results 2022-04-29 09:45:36 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
a129b6d132 FIX phpcs 2022-04-28 22:29:48 +02:00
lainwir3d
3b98f74a56 Fix typo and switch to old join style. 2022-04-28 22:56:44 +04:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
 2022-04-28 19:23:13 +02:00
Laurent Destailleur
559694dd4f API doc 2022-04-28 19:05:23 +02:00
Laurent Destailleur
93815404a2 Fix phpcs 2022-04-28 18:46:52 +02:00
Laurent Destailleur
ebe68350d1 IP for last and previous login is now saved inuser table 2022-04-28 17:34:04 +02:00
Alexandre SPANGARO
7752c5f122 Comment function 2022-04-28 17:24:10 +02:00
Alexandre SPANGARO
f2d81f97b9 Comment function 2022-04-28 17:10:30 +02:00
stickler-ci
96e247bf89 Fixing style errors. 2022-04-28 13:55:54 +00:00
Alexandre SPANGARO
5cc1aba0f5 Merge branch '16a26-Accountancy_reconcile' of https://github.com/aspangaro/dolibarr into 16a26-Accountancy_reconcile 2022-04-28 15:50:16 +02:00
Alexandre SPANGARO
5379db7c6b Fix stickler-ci 2022-04-28 15:49:08 +02:00
stickler-ci
68864840b6 Fixing style errors. 2022-04-28 13:25:50 +00:00
Alexandre SPANGARO
f54501c9e4 Merge remote-tracking branch 'upstream/develop' into 16a26-Accountancy_reconcile 2022-04-28 15:20:05 +02:00
lainwir3d
88bd28323c FIX #20738 Inventory: Add missing <td....> for movement number / card. 2022-04-28 16:46:42 +04:00
lainwir3d
b35b40649f CLOSE #20736 Allow extrafields SQL filters on REST API product lookup 2022-04-28 15:48:07 +04:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
stickler-ci
6ab88d0169 Fixing style errors. 2022-04-28 10:09:02 +00:00
lainwir3d
f0e65e8bdd FIX #20733 Inventory: Do not use batch qty even if present if batch module is disabled. 2022-04-28 14:00:24 +04:00
Christophe Battarel
75f540c30c fix for reshook when several module use the hook but only on is concerned 2022-04-28 11:49:15 +02:00
lmarcouiller
701960bd70 try to fix build fail 2022-04-28 11:47:13 +02:00
IC-faycal
fc6228a48c NEW Events on Proposal to Return to Draft 2022-04-28 11:27:15 +02:00
Laurent Destailleur
d376d28588 Missing trans 2022-04-28 11:12:21 +02:00
Christophe Battarel
729d1f57aa fix select fields 2022-04-28 10:53:16 +02:00
lmarcouiller
be2502c29f New : module webhook database structure 2022-04-28 10:50:55 +02:00
melina
f634d7e503 fix commit 2022-04-28 08:42:44 +02:00
melina
0c8a6bd6f0 fix commit 2022-04-28 08:39:02 +02:00
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02:00
Alexandre SPANGARO
5dce613118 NEW Accountancy - Product admin - Add product categories 2022-04-28 05:34:02 +02:00
Aloïs Micard
fb7f0545e4 Fix error reporting in getLinesArray() 2022-04-27 17:56:31 +02:00
dolibarr95
c969cef731
NEW : Send email to the supplier order contact 
Select the recipient defined in object contact (Vendor contact following-up order / Contact fournisseur suivi commande) in order to send email to the specific contact and not to generic company email (as for invoice/bill)
 2022-04-27 10:09:22 +02:00
Christophe Battarel
25078b292d fix hookmanager 2022-04-27 09:40:09 +02:00
dolibarr95
4939da560f
New: Add option to foce delivery receipt to yes 
Add a constant to force delivery receipt for supplier order.
 2022-04-27 09:25:38 +02:00
Christophe Battarel
543e6f186c add hook to getSellPrice function 2022-04-27 09:03:51 +02:00
Florian HENRY
8fab7bbf55 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_20652 2022-04-27 08:52:31 +02:00
Florian HENRY
dd85c22927 remove combox search box 2022-04-27 08:50:58 +02:00
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:

&eacute;&egrave;&agrave; 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