Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
86,494 Commits 36 Branches 189 Tags
aee6fce9f85d38cfe2a05af77eea7d30a62ea1b3
Commit Graph

941 Commits

Author SHA1 Message Date
BENKE Charlene
5a6cfd5efe Update commande.class.php 2018-07-05 12:08:59 +02:00
Inovea Conseil
30cff2bb36 ADD check user's rights 2018-07-05 11:52:41 +02:00
Regis Houssin
26495fb698 Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!! 2018-07-01 18:49:37 +02:00
Regis Houssin
4925624ed9 Fix: avoid NULL value when "subprice" is 0 2018-06-30 10:38:30 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost 
when clculating total_ht_devise
 2018-06-13 16:35:52 +02:00
Laurent Destailleur
c1f5c6becf Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
f83dedf1b0 Fix space/tab 2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2 Get external contacts ids instead of BILLING contacts ids. 2018-05-28 09:42:24 +02:00
Frédéric FRANCE
e2a557aadd limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Neil Orley
15e02c7082 NEW : adds billing contacts ids to REST API returns 
adds billing contacts ids to REST API returns for proposals, orders and invoices
 2018-05-22 11:40:32 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
72cedcf9f3 Removed method fetch_prods() and get_each_prod() not used, keep only 
get_arbo_each_prod() that is better.
 2018-03-22 18:01:06 +01:00
Laurent Destailleur
e639f2a91f Removed deprecated method classer_facturee(). Duplicate of 
classifyBilled
 2018-03-16 10:51:12 +01:00
Laurent Destailleur
0258d3aeeb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
Laurent Destailleur
ca809a11af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/class/commande.class.php
 2018-03-13 18:04:18 +01:00
Laurent Destailleur
dcd3387a30 Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f Update commande.class.php 2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Romain DELVAL
ee55776886 FIX Duplicate product_type asignement on order addline 
On addline order method, ther is a duplicate assignation on
line->product_type before call to "insert" method.
The second assignement always make product_type to "0" while it was
fetched from product himsel like it was made on first asignement few
lines above
 2018-03-09 12:38:28 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
ATM-Nicolas
a4ae700202 FIX : Avoid empty value to fk_multicurrency attribute 2018-02-27 11:11:32 +01:00
ATM-Nicolas
27100df927 FIX : Avoid empty value to fk_multicurrency attribute 2018-02-27 11:06:11 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra. 
Clean duplicate trigggers "*_CLONE"
 2018-02-20 18:09:38 +01:00
Laurent Destailleur
c6fba7273d Api interventions 2018-02-03 20:58:26 +01:00
Laurent Destailleur
6e446ccaae Fix scrutinizer 2018-02-01 10:51:01 +01:00
Laurent Destailleur
89dc208072 Fix fk_account not into update 2018-01-30 17:00:17 +01:00
Laurent Destailleur
1e438b7ebd Fix travis and return of api that change status 2018-01-05 02:01:57 +01:00
Laurent Destailleur
0fb95fa15f Try a fix for #7778 2018-01-05 01:30:12 +01:00
Laurent Destailleur
f19fb90ab0 Merge #8008 manually 2018-01-04 23:36:14 +01:00
Laurent Destailleur
b0fefffcf8 Fix standardize api code 2017-12-28 12:44:15 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Neil Orley
171e388f6d NEW Update bank account when updating an order 
Add the ability to update the bankaccount when updating an order
 2017-12-19 14:16:51 +01:00
Neil Orley
7e3a2d75bb FIX Error when classify the order as invoiced unsing API 
Remove of notrigger parameter. The notrigger attribute caused a type error when used.
 2017-12-19 13:06:28 +01:00
Neil Orley
fe8fac9577 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:36:46 +01:00
Neil Orley
0817873267 NEW Create an order using an existing proposal 
Create an order using an existing proposal.
 2017-12-18 16:13:54 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales 
representatives
 2017-12-18 16:13:05 +01:00
Neil Orley
5ae74f8ae1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-15 09:56:02 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
77509ee37a Removed deprecated apis 2017-11-25 13:14:28 +01:00