Commit Graph

12304 Commits

Author SHA1 Message Date
kevin
8be5cccb4e Reverse stock movements on mo consumed product 2022-04-06 12:32:10 +02:00
Laurent Destailleur
2e5d0ef92b Merge pull request #20249 from atm-steve/NEW_Employee_management_improvement
New employee management improvement #18434
2022-04-05 15:12:19 +02:00
Laurent Destailleur
2303553fd1 Merge pull request #20392 from thomas-Ngr/develop_fix_ticket_workflow_create_ficheinter_from_public_interface
Fix: ticket/workflow: automatically create ficheinter
2022-04-05 15:08:10 +02:00
Laurent Destailleur
af45691c9d Clean import profiles 2022-04-04 13:35:08 +02:00
Thomas Negre
7469cf79f5 enhance option explanation string 2022-04-04 09:29:03 +02:00
Thomas Negre
2ec7818c75 When the ficheinter can't be created, display an error. 2022-04-04 09:29:03 +02:00
Thomas Negre
8db171ae41 add translation string for workflow ticket fichinter creation 2022-04-04 09:29:03 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +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
a3dbcd0c27 Clean language files 2022-04-01 13:09:11 +02:00
atm-steve
4fa656be96 Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Laurent Destailleur
636188f28a Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date
NEW: check invoice date
2022-03-29 16:07:31 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
5f2ba49dfa Fix regression 2022-03-29 15:20:36 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
2022-03-29 15:02:29 +02:00
Laurent Destailleur
d1c5c79d22 Merge pull request #20299 from
Easya-Solutions/13.0_fix-thirdparty-mandatory-fields-on-validate-invoice

FIX check mandatory thirdparty fields for mass action
2022-03-29 14:53:19 +02:00
Laurent Destailleur
038033f0ec Merge pull request #20389 from atm-GregM/retoursGRH
NEW/fix GRH extrafields and more stuff
2022-03-29 14:19:24 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-28 16:04:12 +02:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
lvessiller
8a7b97bed1 FIX check thirdparty object loaded and properties exist 2022-03-25 16:47:41 +01:00
Gauthier PC portable 024
ab2e6ddf43 FIX : forgotten form confirm before various payment delete 2022-03-25 16:41:41 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
446ee8dc3c Merge pull request #20274 from altairis-noe/mass_action_ship_orders
FIX: Mass action ship orders
2022-03-25 15:15:12 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01:00
Laurent Destailleur
5a947a9e71 Merge pull request #20447 from bb2a/FIX---Lang-PaymentMode
FIX - Lang PaymentMode
2022-03-24 11:54:38 +01:00
BB2A Anthony Berton
1266da05ef Lang fr 2022-03-23 19:43:34 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
289c32b880 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-23 17:23:35 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Laurent Destailleur
94224e9275 Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices
NEW option update prices on proposal cloning
2022-03-23 16:49:12 +01:00
Laurent Destailleur
5f522c9087 Merge pull request #20388 from atm-john/15.0_fix_missing_lang_trad
Fix missing lang trad
2022-03-23 16:19:14 +01:00
Laurent Destailleur
61ed36e181 Update other.lang 2022-03-23 16:19:06 +01:00
Laurent Destailleur
0e63e09fbb Merge pull request #20403 from Easya-Solutions/develop_remake_variants_permissions
NEW : Update variants to standard card and list (permissions)
2022-03-23 16:02:34 +01:00
Laurent Destailleur
1c7e2d3034 Merge pull request #20402 from Easya-Solutions/develop_remake_variants
NEW : Update variants to standard card and list
2022-03-23 16:02:08 +01:00
Marc de Lima Lucio
344c29ae15 FIX: trans 2022-03-22 11:35:37 +01:00
Marc de Lima Lucio
cf64fc288d FIX: propal list: missing not signed massaction translation keys for transifex 2022-03-22 10:49:03 +01:00
Marc de Lima Lucio
8ef55eae07 FIX: propal list: missing translation keys for transifex 2022-03-22 10:04:05 +01:00
Laurent Destailleur
2e27c40de4 Fix customreport with link to parents 2022-03-21 22:10:51 +01:00
Laurent Destailleur
40fbaf15fe Add welsh language 2022-03-21 17:12:26 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
John BOTELLA
989f00ae63 Update other.lang 2022-03-18 09:42:37 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00