Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

1387 Commits

Author SHA1 Message Date
Jean Traullé
237c29d428 FIX #11427 require product class 
Fixes POST /supplierinvoices REST API endpoint
 2019-08-31 00:07:14 +02:00
Jean Traullé
c32c7d48ba Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Christophe Battarel
8c8844d7ae Differentiate supplier orders status 2019-08-30 09:33:01 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
b8406f842d Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
7035bf88ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 19:52:01 +02:00
Laurent Destailleur
f1a63fd51b Merge pull request #11684 from jtraulle/fix-rest-api-supplierinvoices-post-with-lines-fk_product 
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
 2019-08-15 19:51:12 +02:00
Laurent Destailleur
f26a13ff13 NEW Removed deprecated code that create linked object from ->origin 2019-08-15 19:50:18 +02:00
Jean Traullé
c739b95666 Fix codestyle 
lessc.class.php should be excluded from ruleset as it is an external lib
 2019-08-14 23:33:06 +02:00
Jean Traullé
003642fe10 Preserve spaces instead of tabs for indentation. 2019-08-14 23:07:18 +02:00
Jean Traullé
1d2c2f8551 NEW Add payments GET and POST REST API endpoints for supplierinvoices. 2019-08-14 23:00:40 +02:00
Jean Traullé
b90815b972 FIX require product class (fixes POST /supplierinvoices REST API endpoint) 
When passing a fk_product field into a supplier invoice line on the POST /supplierinvoices REST API endpoint, we need to require the product class first in fournisseur.facture.class.php to be able to load the Product from the passed id.
 2019-08-13 16:36:41 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
f53f314211 Update fournisseur.product.class.php 2019-07-18 17:15:50 +02:00
Christophe Battarel
5daf0316f9 also fix bad insert sql command 2019-07-18 11:18:25 +02:00
Christophe Battarel
32bc8a5faf FIX fournrprice log for insert 2019-07-18 11:05:51 +02:00
gauthier
c72a59ad36 FIX : we need to be able to add freeline with qty between 0 & 1 in supplierorder line 2019-07-16 14:55:19 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
a2d50eb95a Fix sql regression 2019-06-25 18:12:12 +02:00
Laurent Destailleur
0c3f524319 Clean code 2019-06-25 16:12:16 +02:00
Laurent Destailleur
f6719db4f3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 16:09:08 +02:00
Laurent Destailleur
a98ceb584d Fix syntax error 2019-06-25 16:08:01 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
8cc6c18931 Fix bad label on supplier invoice 2019-06-25 12:53:23 +02:00
Laurent Destailleur
3c6d271c67 Removed deprecated fields 2019-06-25 12:42:36 +02:00
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