Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-25 18:23:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 38 Branches 191 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

99909 Commits

Author SHA1 Message Date
Thomas Negre
0c0ff4dec9 add WORKFLOW_TICKET_CREATE_INTERVENTION to workflow constants 2022-04-04 09:29:03 +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
d0ed15ce5c Typo 2022-04-03 17:12:54 +02:00
Laurent Destailleur
edf779505c FIX download of file must be done using a GET href link, not a POST. 2022-04-03 17:12:45 +02:00
Laurent Destailleur
564382ec6c Upgrade ACE Editor from 1.4.7 to 1.4.14 2022-04-03 12:56:07 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
395758f213 Doxygen 2022-04-03 12:24:03 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
9ff4903608 css 2022-04-02 19:52:12 +02:00
Laurent Destailleur
c8bd222c05 Upgrade jquery to 3.6 and jquery-ui to 1.13.1 2022-04-02 19:50:26 +02:00
Laurent Destailleur
fde856a243 Upgrade mobildetect 2.89.39 2022-04-02 19:27:48 +02:00
Laurent Destailleur
45fb57c413 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-02 18:18:40 +02:00
Laurent Destailleur
4f6f8ba128 FIX #20177 2022-04-02 18:18:24 +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
f1d5695cb0 Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Laurent Destailleur
16b18557a9 Merge pull request #20190 from atm-GregM/DolGetButtonAction_Product_card 
FIX: replace butAction to dolGetButtonAction on product card
 2022-04-02 18:09:49 +02:00
Laurent Destailleur
f141eee005 Update card.php 2022-04-02 18:08:52 +02:00
Laurent Destailleur
f07e11179d Merge pull request #20472 from hregis/fix_avoid_hooks_conflict 
NEW add hooks contact tab badge and hooks parameter for avoid conflicts
 2022-04-02 18:06:01 +02:00
Laurent Destailleur
e559ad2aba Optimize column size 2022-04-02 16:50:36 +02:00
Laurent Destailleur
0eecae68f2 Merge pull request #20525 from aspangaro/16a15 
NEW Accountancy - Add ref supplier and label on supplier binding page
 2022-04-02 16:33:10 +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
c4c7b19fbe Merge pull request #20514 from FHenry/new_hidden_option_in_contractPDF 
NEW add hidden option on contract PDF line to hide qty and price
 2022-04-02 16:29:37 +02:00
Laurent Destailleur
1c71a76d6e Merge pull request #20518 from frederic34/patch-1 
use calculated visibility of extrafields in list
 2022-04-02 16:23:04 +02:00
Laurent Destailleur
4fc07d96d8 Merge pull request #20519 from joseplluis/patch-11 
BUG expedition and warehouse with children
 2022-04-02 16:22:23 +02:00
Laurent Destailleur
d3161f2c4e Clean code 2022-04-02 16:19:34 +02:00
Laurent Destailleur
7745203c16 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-02 16:17:04 +02:00
Laurent Destailleur
bb5cf1ed2e Merge pull request #20517 from ATM-Consulting/FIX_16.0_getNomUrl_for_supplier_invoice_templates 
FIX 16.0 - copy `title` over `ref` on FactureFournisseurRec object
 2022-04-02 16:16:55 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
7e34ce7245 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2022-04-02 15:39:15 +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
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for 
code consistency purpose.
 2022-04-02 10:31:58 +02:00
Alexandre SPANGARO
141e795de2 NEW Accountancy - Add ref supplier and label on supplier binding page 2022-04-02 05:30:49 +02:00
Laurent Destailleur
2eaae819f2 Merge pull request #20522 from ATM-Consulting/FIX_16.0_missing_triggers_facturerec_facturefournisseurrec 
FIX: missing trigger DELETE for FactureRec, FactureFournisseurRec
 2022-04-01 20:13:37 +02:00
Laurent Destailleur
408608ebea Merge pull request #20430 from atm-GregM/DolGetButtonAction_Commande 
FIX: replacing to dolGetButtonAction on Commande card
 2022-04-01 20:10:13 +02:00
Laurent Destailleur
7b9b5d726a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-01 19:32:35 +02:00
Laurent Destailleur
9fd4368195 Fix message on best vote 2022-04-01 19:30:22 +02:00
atm-florian
96c432566d NEW 16.0 - proposal for a prefix-based consistency mechanism for trigger names 2022-04-01 19:20:47 +02:00
Laurent Destailleur
256b2f4493 NEW Show number of votes into the label of tab "Results" of a survey 2022-04-01 19:17:25 +02:00
atm-florian
5a52650548 FIX: missing trigger DELETE for FactureRec, FactureFournisseurRec 
+ trigger name consistency ('UPDATE' -> 'MODIFY')
 + preparing future consistency mechanism with class constant
 2022-04-01 19:07:17 +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
Josep Lluís
eb14d1d31f BUG expedition and warehouse with childen 
if a warehouse was selected by user, picking is limited to this warehouse and his children (same check is done in products without batch)
 2022-04-01 16:37:32 +02:00
Frédéric FRANCE
4669d58fcc use calculated visibility of extrafields in list 2022-04-01 16:16:45 +02:00
atm-florian
d84af9fdcd FIX space-based indent (misconfigured IDE didn't take editorconfig into account) 
+ fix tab-based code alignment whitespace (≠indentation)
 2022-04-01 15:40:03 +02:00
atm-florian
560b8dc04c FIX 16.0 - copy title over ref on FactureFournisseurRec object 2022-04-01 15:26:06 +02:00
Laurent Destailleur
ab4e89d678 Merge pull request #20516 from atm-jpb/FIX_TD_inexpensereport 
fix : remove tds added by mistake
 2022-04-01 14:49:48 +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
9389b96d1d Merge pull request #20478 from rycks/develop 
fix #20477: add online_payment_url on orders API requests
 2022-04-01 14:47:38 +02:00