Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 08:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,004 Commits 37 Branches 191 Tags
8ad5dc81de8268eea6ed4e299a5fe4088712abc4
Commit Graph

220 Commits

Author SHA1 Message Date
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:13:20 +02:00
Laurent Destailleur
84b2929604 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:34 +02:00
Laurent Destailleur
eb0c76f613 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:08:59 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
Florian Mortgat
215085e0e6 FIX: unit price divided by quantity when accepting supplier price proposal 2020-08-28 15:51:39 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
John Botella
fc1de5b4f3 Fix multicurecy option not applied 2020-07-23 11:10:18 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
Laurent Destailleur
99f445962b Fix regression 2020-04-25 03:38:12 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
Marc Guenneugues
ab5c2b1fd5 Clean line extrafields when deleting supplier proposal 2020-04-23 18:33:58 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
8d59ce2e03 Look and feel v12 2020-04-20 02:48:05 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4c8a04cf38 Fix phpcs 2020-04-02 21:17:04 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
19084286be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.product.class.php
 2020-04-02 16:49:37 +02:00
Laurent Destailleur
3c75c29e6b Merge pull request #13463 from atm-quentin/FIX_buyprice_filter_was_only_qty 
FIX : Buyprice was updated only if min price for this qty had same qty
 2020-04-02 13:08:40 +02:00
Laurent Destailleur
c6f57c46a8 Update supplier_proposal.class.php 2020-04-02 13:01:49 +02:00
stickler-ci
1f5da36fdb Fixing style errors. 2020-03-31 13:02:44 +00:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
atm-quentin
73f6c9210f FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL 2020-03-31 11:03:08 +02:00
stickler-ci
38029abcb1 Fixing style errors. 2020-03-26 08:34:27 +00:00
Tobias Sekan
f7762f11db Fix change multicurrency line in supplier proposal 2020-03-26 09:13:56 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
1657a6b50a FIX actions on supplier proposal not saved (bad trigger name) 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-03-24 15:00:13 +01:00
Laurent Destailleur
d922eb270d FIX actions on supplier proposal not saved (bad trigger name) 2020-03-24 13:25:45 +01:00
Laurent Destailleur
2b33ef7e46 Align color of graph of status on status color 2020-03-24 13:06:59 +01:00
Laurent Destailleur
7866f89585 Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
1904ae0e82 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-02-17 12:25:51 +01:00
Laurent Destailleur
a02f5cde92 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
 2020-02-17 12:21:07 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00