Commit Graph

2690 Commits

Author SHA1 Message Date
Laurent Destailleur
8079a389f8
Merge pull request #10992 from altatof/faccard2
NEW : retrieve invoice infos from order when billing shipment
2019-04-11 16:34:42 +02:00
Laurent Destailleur
f2fd07d824
Merge pull request #10991 from altatof/faccard
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
2019-04-11 16:31:37 +02:00
Laurent Destailleur
4f87018c33
Update card.php 2019-04-11 16:31:13 +02:00
Christophe Battarel
46e398f3d3 NEW : retrieve invoice infos from order when billing shipment 2019-04-10 10:50:01 +02:00
Christophe Battarel
b04296984d NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN 2019-04-10 10:29:17 +02:00
Christophe Battarel
5f9f615e11 fix form_conditions_reglement parameters 2019-04-09 18:37:36 +02:00
Christophe Battarel
790c5f493a fix select_conditions parameters 2019-04-09 18:32:00 +02:00
Christophe Battarel
01255602d8 fix select_conditions parameters 2019-04-09 18:30:58 +02:00
Christophe Battarel
5382ad207f NEW : add payment terms to invoices list 2019-04-09 18:26:00 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
Dan Rusu
4597e78a9d Re synchronized the UI action button "Mark as credit available" with API
At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places
2019-04-06 20:10:11 +03:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Laurent Destailleur
5e23c4c03c Fix self: not defined in a page 2019-03-29 16:23:55 +01:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
11e4411400 TakePOS Can enter payment in several times and with different modes 2019-03-27 15:42:53 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates
FIX: Disallow line start date after end date
2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-22 12:56:46 +01:00
Laurent Destailleur
48a0c447b4 Fix test on draft status regression 2019-03-21 21:00:06 +01:00
Laurent Destailleur
47eb256b82 Fix phpcs 2019-03-21 18:22:17 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Laurent Destailleur
5d21547854 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/price.php
	htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
eab11ce743 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2019-03-19 13:14:44 +01:00
Laurent Destailleur
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +01:00
Laurent Destailleur
b11403103b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Laurent Destailleur
eaaea2c2f9 Fix set of due date when invoice created from API 2019-03-19 12:08:55 +01:00
Laurent Destailleur
bca10084c5
Merge pull request #10882 from alexandreaj/patch-1
Update api_invoices.class.php
2019-03-19 12:07:16 +01:00
Laurent Destailleur
70cb042e58
Update api_invoices.class.php 2019-03-19 12:06:57 +01:00
Laurent Destailleur
b10690ce88
Merge pull request #10874 from grandoc/translation
translation
2019-03-19 11:14:40 +01:00
Laurent Destailleur
6bead00260 Better text 2019-03-19 10:27:36 +01:00
Laurent Destailleur
3f62098b81 Add hours in date 2019-03-19 10:14:13 +01:00
alexandreaj
9bb1ede65a
Update api_invoices.class.php
Adding possibility to set due date (date_lim_reglement field in mysql) via the API.
2019-03-18 21:11:13 +01:00
Laurent Destailleur
41c737a213 Fix, Oops, test was inverted 2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753 Fix do we really must copy notes when creating an object from another
source object? Add a hack with hidden option to be able to change this.
2019-03-18 20:09:09 +01:00
Christophe Battarel
8b3fd2eacf NEW : add constant NO_CONCAT_DESCRIPTION 2019-03-18 16:10:17 +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
89087c6847
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice
Wrong vat if deposit from propal with multiple vat
2019-03-18 11:14:11 +01:00
Regis Houssin
57091f08b0 FIX missing entity filter and wrong var name 2019-03-18 10:53:43 +01:00
Laurent Destailleur
1abfd1f58e Add page to setup module debugbar
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
7cdfff7263 Fix syntax error 2019-03-15 20:42:49 +01:00
Laurent Destailleur
875b5b6a8d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/opensurvey/studs.php
2019-03-15 19:20:22 +01:00
Laurent Destailleur
39e24d30aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
b33c366b02
Update card.php 2019-03-15 19:16:49 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00