Commit Graph

1195 Commits

Author SHA1 Message Date
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-06-20 03:39:48 +02:00
Laurent Destailleur
53688e2d0f Merge pull request #11353 from fmarcet/8.0
FIX: Wrong stock movement on supplier credit notes
2019-06-20 03:11:28 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +02:00
Laurent Destailleur
ff1adb3934 Fix dead code 2019-06-13 22:11:25 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
49646663a1 Fix link on invoice 2019-06-07 22:47:15 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
Rüdiger Hahn
acb2f59f56 Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc
cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.
2019-05-06 19:22:49 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
atm-quentin
7ae6472e36 Merge branch '8.0' of github.com:Dolibarr/dolibarr into FIX_credit_note_used_on_list 2019-04-12 09:20:16 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
2019-04-04 17:45:02 +02:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97 Merge pull request #10898 from grandoc/new_branch_21_03_2019
add some comments
2019-03-21 18:29:11 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Philippe GRAND
6babf88968 add some comments 2019-03-21 15:11:28 +01:00
Frédéric FRANCE
2fddf38da1 correct replacement of align 2019-03-19 12:55:33 +01:00
Laurent Destailleur
9a3c66b057 Merge pull request #10846 from grandoc/new_branch_15_03_2019
New branch 15 03 2019
2019-03-19 12:13:02 +01:00
Philippe GRAND
c13a1dbc63 translation 2019-03-18 13:45:24 +01:00
Philippe GRAND
0f03b16313 translation 2019-03-18 12:46:32 +01:00
Laurent Destailleur
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Philippe Grand
8054f61bac Update fournisseur.product.class.php
Oops...to much alcohol..
2019-03-16 09:14:57 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Philippe GRAND
2463ee47ba update with html5 compliant code 2019-03-15 09:40:52 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
2713c430df Merge branch 'develop' into dev_datepricefour 2019-03-14 18:43:09 +01:00
Laurent Destailleur
463c83efec Update fournisseur.product.class.php 2019-03-14 18:37:03 +01:00
Laurent Destailleur
8f65ee2296 Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
60db66d2bf Update fournisseur.product.class.php 2019-03-14 17:41:33 +01:00
Laurent Destailleur
250e0bbaac Update fournisseur.product.class.php 2019-03-14 17:40:39 +01:00
Laurent Destailleur
dd962fa044 Update fournisseur.product.class.php 2019-03-14 17:39:01 +01:00
Laurent Destailleur
233bd4374a Fix phpcs 2019-03-08 19:52:26 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
2019-03-07 14:13:38 +01:00
Laurent Destailleur
0729a3b571 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:11:12 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2019-03-07 14:06:11 +01:00
Laurent Destailleur
e3fb228a4d Update fournisseur.facture.class.php 2019-03-07 12:28:19 +01:00
gauthier
0ff2905180 FIX : we need to keep originline special_code 2019-03-06 12:10:24 +01:00