Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

1201 Commits

Author SHA1 Message Date
Francis Appels
7ad48064be Add code to show in fourn price tooltip. 2019-01-22 16:18:25 +01:00
Francis Appels
946c017937 Fix and clean price log. Key should price id iso product id. 2019-01-22 15:59:47 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
b4a6311f64 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-10 01:48:04 +01:00
Laurent Destailleur
057b606663 Fix tooltip 2019-01-09 15:03:44 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not 
conciliated yet.
 2019-01-09 13:28:12 +01:00
Laurent Destailleur
d9999d61f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
3d30d8513f Fix phpcs 2018-12-16 20:36:22 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
6ad106d14a Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
atm-quentin
3da9650003 FIX if qty is 0 2018-12-10 16:06:11 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
135a94dfed Merge branch '7.0up' into 7.0 2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Frédéric FRANCE
9692e98acf Update fournisseur.facture.class.php 2018-12-01 22:49:12 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Frédéric FRANCE
2e4ec1ed10 Update fournisseur.commande.class.php 2018-11-19 23:56:20 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
4dca94480e Merge pull request #9892 from atm-maxime/fix_supp_inv_clone 
Fix invoice supplier clone was not getting all lines parameters #9800
 2018-10-30 14:59:48 +01:00
Laurent Destailleur
76c3bac777 Merge pull request #9900 from frederic34/patch-21 
use strict compare
 2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9 Merge pull request #9899 from frederic34/patch-20 
use strict compare
 2018-10-30 14:23:01 +01:00
John BOTELLA
ca47d1b8b1 Fix clone fourn order and invoice lines special code 2018-10-30 10:26:59 +01:00
Frédéric FRANCE
d7507ac858 use strict compare 2018-10-27 21:00:59 +02:00
Frédéric FRANCE
84219039a2 use strict compare 2018-10-27 20:57:59 +02:00
Frédéric FRANCE
e1625990f2 use strict compare 2018-10-27 20:54:53 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
4ec80b5136 Fix invoice supplier clone was not getting all lines parameters #9800 2018-10-27 10:53:01 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
atm-quentin
04eb9ca167 fix dont change num version 2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
cfff4c7df8 NEW add ref supplier on supplier invoice 2018-10-22 14:32:50 +02:00
atm-quentin
dd0a57d39e FIX pdf for creating invoice without massaction 2018-10-17 15:36:47 +02:00
atm-quentin
236a61ab55 new manage correctly create bills on reception 2018-10-17 11:56:32 +02:00