lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
74,908 Commits 43 Branches 150 Tags 886 MiB
9105e205ff
Commit Graph

8811 Commits

Author SHA1 Message Date
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
Laurent Destailleur
1409d1a2c8 Fix phpcs 2019-03-24 19:52:48 +01:00
Laurent Destailleur
89b7f1a040 Fix phpcs 2019-03-24 19:52:18 +01:00
Laurent Destailleur
3578c7cb0a Fix phpcs 2019-03-24 18:20:56 +01:00
Laurent Destailleur
364deb1476 Fix phpcs 2019-03-24 16:09:48 +01:00
Laurent Destailleur
28abf5663b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-24 15:06:16 +01:00
Laurent Destailleur
2034ac61ef Fix phpcs 2019-03-24 15:05:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:36:04 +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
37cc5b7d35
Merge pull request #10901 from fmarcet/8.0 
FIX: The minimum amount filter does not work in VAT report by customer
 2019-03-22 12:27:30 +01:00
Ferran Marcet
f37c1b9287 FIX: The minimum amount filter does not work in the VAT report per customer 2019-03-22 09:28:50 +01:00
Laurent Destailleur
48a0c447b4 Fix test on draft status regression 2019-03-21 21:00:06 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019 
add some comments
 2019-03-21 18:29:11 +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
Philippe GRAND
cb59f52a55 add some comments 2019-03-21 15:01:09 +01:00
Philippe GRAND
86c3b1a5b0 add some comments 2019-03-21 14:59:21 +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
Frédéric FRANCE
89e8889c5c
phpcs fix v9 2019-03-19 16:33:34 +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
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
 2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +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