lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,274 Commits 43 Branches 150 Tags 886 MiB
8d997de3bb
Commit Graph

107274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Negre
8d997de3bb add options in workflow admin panel : WORKFLOW_TICKET_LINK_CONTRACT, WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS 2022-03-17 16:05:35 +01:00
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket. 
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
 2022-03-17 16:05:35 +01:00
Thomas Negre
a14a63fdad Contrat->getListOfContracts(): allow to sort contracts by contract status, product category, and line status. 2022-03-17 16:05:35 +01:00
Thomas Negre
4d01969a4c Societe: add method to find parent companies 2022-03-17 16:05:35 +01:00
Laurent Destailleur
f75049d0e8
Merge pull request #20356 from aspangaro/16a3 
NEW Accountancy - Add subledger account when we generate a transaction with a deposit invoice
 2022-03-17 15:34:07 +01:00
Alexandre SPANGARO
2ef8bd42df Merge remote-tracking branch 'upstream/develop' into 16a3 2022-03-17 14:44:38 +01:00
Alexandre SPANGARO
0856a49ef0 Fix 2022-03-17 14:44:00 +01:00
Laurent Destailleur
2f2a70c8b7 Clean code 2022-03-17 14:15:28 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57:50 +01:00
Laurent Destailleur
7aeaaab7f0
Merge pull request #20365 from gdsoftdev/fix_invoicelineorders 
Fix : keep row order into invoices created from massactions
 2022-03-17 13:37:17 +01:00
Laurent Destailleur
a06b51e06c
Merge pull request #20385 from hregis/fix_missing_object_for_known_current_element 
FIX missing to known the current object element
 2022-03-17 13:29:22 +01:00
Laurent Destailleur
7d60eefb9a
Merge pull request #20386 from hregis/new_add_hook_in_select_product 
NEW add hooks select product list and select thirdparty list function
 2022-03-17 13:26:01 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Regis Houssin
a73b92c871 NEW add selectContactListWhere hook 2022-03-17 11:08:09 +01:00
Regis Houssin
dbd0dd7e97 NEW add selectThirdpartyListWhere hook 2022-03-17 10:54:09 +01:00
Regis Houssin
e8b5fa45f2 FIX missing global $hookmanager 2022-03-17 09:55:26 +01:00
Regis Houssin
7a3b051ca0 FIX missing object element and action 2022-03-17 09:51:44 +01:00
Regis Houssin
b0fe8994e4 NEW add hook selectProductsListWhere in select_produits_list function 2022-03-17 09:32:45 +01:00
Regis Houssin
f6c9791f2f FIX missing to known the current object element 2022-03-17 09:18:08 +01:00
Laurent Destailleur
c6338e0de0
Merge pull request #20252 from wdammak/patch-47 
Simplification of the code by separating the part given to menu proce…
 2022-03-17 02:48:08 +01:00
Laurent Destailleur
1a8af3509e Fix regression in button 2022-03-17 00:19:48 +01:00
Laurent Destailleur
b1e826da15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-17 00:16:28 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
 2022-03-17 00:15:01 +01:00
Laurent Destailleur
5eb51979a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-17 00:12:17 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
3346d64416
Merge pull request #20305 from fmarcet/14.0 
Fix: Error whem generating supplier payment pdf
 2022-03-16 22:46:53 +01:00
Laurent Destailleur
5b2e1fc374
Merge pull request #20306 from fmarcet/15.0 
Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work
 2022-03-16 22:41:54 +01:00
Laurent Destailleur
54da09bb71
Merge pull request #20310 from ymollard/15.0 
Restoring missing VATIsNotUsed label (15.0)
 2022-03-16 22:38:52 +01:00
Laurent Destailleur
71a4a9a48b
Merge pull request #20313 from atm-kevin/NEW_WYSIWYG_ON_PROJECT_TASKS 
NEW : Project's tasks WYSIWYG editor
 2022-03-16 22:36:24 +01:00
Laurent Destailleur
090b5c41bf
Merge pull request #20316 from atm-gauthier/14.0_fix_round_unitprice_with_MU 
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
 2022-03-16 22:34:49 +01:00
Laurent Destailleur
3f7a807eba
Merge pull request #20383 from fappels/develop_remember_origin_for_butactionnew 
New: Remember origin for newbutton inside create form.
 2022-03-16 22:33:00 +01:00
Laurent Destailleur
ef19769249
Merge pull request #20318 from Achicken7301/develop 
Vietnam date format, VAT rates
 2022-03-16 22:22:20 +01:00
Laurent Destailleur
16f9c74039
Merge pull request #20319 from frederic34/patch-7 
tooltip order date is date not datetime
 2022-03-16 22:21:55 +01:00
Laurent Destailleur
38a8f52e8b Missing init of model 2022-03-16 22:21:04 +01:00
Laurent Destailleur
f533184f70
Merge pull request #20320 from atm-steve/FIX_Contrat_dolGetButtonAction 
FIX: Contrat dolGetButtonAction
 2022-03-16 22:18:35 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Laurent Destailleur
228295d29f
Merge pull request #20321 from SylvainLegrand/Fix_error_dispatch_supplier_order_invert_DLC_DLUO 
DLC and DLUO are reversed in the called function
 2022-03-16 22:14:45 +01:00
Laurent Destailleur
62f84f0357
Merge pull request #20325 from hregis/fix_missing_multientity_managed 
FIX missing multientity managed
 2022-03-16 22:10:16 +01:00
Laurent Destailleur
55a421870c
Merge pull request #20333 from dolibit-ut/dolibit-ut-patch-menu_auguria_#5 
Dolibit ut patch menu auguria #5
 2022-03-16 22:09:58 +01:00
Laurent Destailleur
7fb6088e10
Merge pull request #20326 from bb2a/Lang-mass-action-nosign 
FIX - Lang mass action propal noSign
 2022-03-16 22:09:12 +01:00
Laurent Destailleur
9c8ac4e145
Merge pull request #20334 from dolibit-ut/patch-376 
Update step2.php
 2022-03-16 22:08:57 +01:00
Laurent Destailleur
79dbfac4ec
Merge pull request #20336 from dolibit-ut/patch-378 
Update llx_adherent.sql
 2022-03-16 22:03:42 +01:00
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2022-03-16 22:02:40 +01:00
Laurent Destailleur
f0161d1939 Fix revert a change was not a bug fix but a new feature 2022-03-16 21:59:58 +01:00
Francis Appels
e55a1f2783 Remember origin for newbutton inside create form. 2022-03-16 21:59:34 +01:00
Laurent Destailleur
b0720902d6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:53:28 +01:00
Laurent Destailleur
b0525c7a7f
Merge pull request #20358 from atm-greg/FIX_missing_hooks_for_dictionaryadmin 
add more specific context and doAction hook
 2022-03-16 21:52:25 +01:00
Laurent Destailleur
ab2018e9b4
Merge pull request #20376 from oscim/patch-45 
Update notify.class.php
 2022-03-16 21:46:15 +01:00