Commit Graph

54672 Commits

Author SHA1 Message Date
Laurent Destailleur
810a6c2cb4 Better explanation 2016-04-27 13:39:54 +02:00
Laurent Destailleur
77fcbd3884 FIX: init var at wrong place report incorrect "shippable" flag on draft
order.
2016-04-27 12:34:52 +02:00
Laurent Destailleur
2beb16ef32 Remove limit on product ref on replenishment 2016-04-27 12:30:36 +02:00
Laurent Destailleur
bb91fb174b FIX: init var at wrong place report incorrect "shippable" flag on draft
order.
2016-04-27 12:30:00 +02:00
Laurent Destailleur
60e693e9a4 Minor fixes on recurring invoices 2016-04-27 11:35:11 +02:00
Laurent Destailleur
bdb7fe8d29 Missing public note on recurring invoices
Can change position of lines in recurring invoices
2016-04-27 11:07:20 +02:00
Laurent Destailleur
11217db8c4 FIX: when creating project from template/recurring invoice creation, we
lost information we were working in template/recurring invoice.
2016-04-27 10:56:40 +02:00
nka11
19e223e84b Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_improvement 2016-04-27 09:43:00 +02:00
Florian HENRY
1d75c5f720 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/commonobject.class.php
2016-04-27 09:41:42 +02:00
Florian HENRY
bfbb1c20bc FIX bug on email template 2016-04-27 09:27:59 +02:00
nka11
98f757a87a New API methods
add user to group
get product list by category id
2016-04-27 08:59:12 +02:00
Laurent Destailleur
78cda5dc07 Fix problem with code of reccuring invoices 2016-04-26 22:00:41 +02:00
Florian HENRY
b82a216879 fix confilct 2016-04-26 14:21:40 +02:00
Florian HENRY
8d91523619 NEW : Enabled feature hidden extrafeilds 2016-04-26 14:17:20 +02:00
Florian HENRY
c7a9f26ee5 NEW : continue hidden extrafield feature 2016-04-26 14:17:19 +02:00
Laurent Destailleur
56b57b0bc9 Code comment 2016-04-26 13:37:09 +02:00
Laurent Destailleur
66ea799eb7 Uniformize code and add more comment to understand workflow 2016-04-26 13:27:32 +02:00
Laurent Destailleur
714b5556f3 FIX if qty to ship is < 0, we sugest 0 2016-04-26 13:13:18 +02:00
Florian HENRY
94d92d3cbb Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-26 10:26:45 +02:00
Laurent Destailleur
4758c82d41 Solve minor translation 2016-04-26 09:45:19 +02:00
nka11
c8432fcccd Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6 2016-04-26 07:37:58 +02:00
nka11
56d25a7c2b Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053 2016-04-26 07:31:00 +02:00
Laurent Destailleur
a2a5fa6f4f Update screenshots 2016-04-26 01:13:55 +02:00
Alexis Algoud
91bea8b9fe fix inclusion 2016-04-25 18:54:28 +02:00
Alexis Algoud
bf1f805bf6 FIX trad 2016-04-25 18:40:38 +02:00
Alexis Algoud
b46c14812c Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop 2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db NEW decrease stock on expedition closing/classifying 2016-04-25 18:33:39 +02:00
Alexis Algoud
7658a86bc9 NEW show detail per warehouse into reassort 2016-04-25 15:34:54 +02:00
Francis Appels
11c31667b8 Update product.class.php
Fix updatePrice syslog. 
Is travis still running phpunit tests?
2016-04-25 15:04:33 +02:00
fappels
6bf52558e4 Fix #5100 Develop unable to create new third party
Only set fk_stcomm if available
Do not set 'null' into float databasefield
2016-04-25 12:13:28 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Alexis Algoud
1746f8f96c FIX search on date into supplier invoice list dont work because of status -1 2016-04-25 11:25:49 +02:00
Laurent Destailleur
c73f4e5d7b FIX Project was lost when creating invoice from a template
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
fappels
93fd994435 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-04-24 19:37:06 +02:00
Laurent Destailleur
ccdbf69cd5 Bette explanation on how to create an repeatable invoice 2016-04-24 18:11:19 +02:00
aspangaro
d0b2068ab1 FIX: Accountancy - Upgrade Cegid Bank export 2016-04-24 14:41:14 +02:00
Maxime Kohlhaas
02aa3f5688 Debug double conf 2016-04-24 12:14:03 +02:00
nka11
8b92e552a3 fix #5053 and bogus 051c5f4 2016-04-24 09:55:19 +02:00
aspangaro
f5c1406beb FIX: Accountancy - Fix on bank journal to support subcription 2016-04-24 06:10:15 +02:00
BENKE Charlie
dde4f7ed85 minor error code 2016-04-24 02:01:29 +02:00
Laurent Destailleur
bcb4b2b607 Work on website module 2016-04-23 21:34:10 +02:00
BENKE Charlie
961c086be3 </option> not present in some select list 2016-04-23 20:17:45 +02:00
Marcos García de La Fuente
82ee964c27 NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
Close #4972
2016-04-23 18:22:11 +02:00
Maxime Kohlhaas
651213123f Oups missing $conf 2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
2c6f58e689 Add choices in PDF admin page 2016-04-23 17:37:12 +02:00
Maxime Kohlhaas
930b4a9be0 New var name 2016-04-23 17:36:55 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Maxime Kohlhaas
ad26fb2824 New option to show details in pdf page foot 2016-04-23 17:23:44 +02:00
Maxime Kohlhaas
0358db0065 Fix use of details in pdf foot 2016-04-23 17:10:56 +02:00
Laurent Destailleur
9d21b63562 Beautify a page 2016-04-23 16:55:08 +02:00