Commit Graph

72445 Commits

Author SHA1 Message Date
laurantines
fa598ad941
Update modFacture.class.php
Add localtax1 and localtax2 fields in the export of customer invoices to be able to select them in step 2 of the export
2019-01-17 11:31:32 +01:00
Laurent Destailleur
ab5aaa6b43 Start debug compta-files 2019-01-17 00:32:43 +01:00
Laurent Destailleur
889ce7fc5d Start debug compta-files 2019-01-17 00:09:05 +01:00
Laurent Destailleur
0eb9985366 Feature must be visible in dev mode 2019-01-16 23:05:32 +01:00
Laurent Destailleur
a32bafe406 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 22:59:52 +01:00
Laurent Destailleur
4b743a776d Show date of last result in cron list 2019-01-16 22:59:42 +01:00
Laurent Destailleur
2ce8529c06
Merge pull request #10346 from grandoc/new_branch_16_01_2019
update with html5 compliant code
2019-01-16 19:39:31 +01:00
Philippe Grand
98ebc0a667
Update index.php 2019-01-16 19:24:15 +01:00
Philippe Grand
551a1a5e58
Update lines.php 2019-01-16 19:23:41 +01:00
Philippe Grand
3cc68aca21
Update index.php 2019-01-16 19:23:08 +01:00
Philippe Grand
13ea2d93dd
Update index.php 2019-01-16 19:22:29 +01:00
Philippe Grand
5810fa9acd
Update list.php 2019-01-16 19:21:19 +01:00
Philippe Grand
dff30f17a5
Update productaccount.php 2019-01-16 19:20:28 +01:00
Philippe Grand
c9aa00c09f
Update productaccount.php 2019-01-16 19:19:54 +01:00
Philippe Grand
6d266d78b1
Update productaccount.php 2019-01-16 19:19:14 +01:00
Philippe Grand
27edf7c803
Update importaccounts.php 2019-01-16 19:18:36 +01:00
Philippe Grand
9e699b59ad
Update fiscalyear.php 2019-01-16 19:17:53 +01:00
Philippe Grand
dfceecc04f
Update index.php.install 2019-01-16 19:14:24 +01:00
Laurent Destailleur
8d4d1dbf99 Fix phpcs 2019-01-16 18:51:51 +01:00
Laurent Destailleur
3a8afafabd
Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice
New manage multicompany for invoice
2019-01-16 18:51:01 +01:00
Philippe GRAND
3168c76946 update with html5 compliant code 2019-01-16 17:39:40 +01:00
Philippe GRAND
ab23fe044a update with html5 compliant code 2019-01-16 17:34:36 +01:00
Philippe GRAND
97f22c58bb Merge remote-tracking branch 'upstream/develop' into new_branch_16_01_2019 2019-01-16 16:58:36 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
688311c761 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-16 16:45:38 +01:00
Laurent Destailleur
698222c769 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/adherents/subscription.php
2019-01-16 16:45:30 +01:00
Laurent Destailleur
476527e71e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-01-16 16:34:46 +01:00
Laurent Destailleur
6becdc8af4 Fix missing substitution of ID 2019-01-16 16:34:36 +01:00
Laurent Destailleur
21741b6409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:42 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
638be67f96 Fix tooltip 2019-01-16 13:56:13 +01:00
Philippe GRAND
31a83701ba Fix translation 2019-01-16 13:44:49 +01:00
Philippe GRAND
64875b670c Clean code 2019-01-16 13:40:44 +01:00
Philippe GRAND
88e90f9020 Clean and update code 2019-01-16 13:36:38 +01:00
Philippe GRAND
2aa04e7f9c Clean code and fix translation file 2019-01-16 13:28:13 +01:00
Laurent Destailleur
1f9d0799b6
Merge pull request #10344 from grandoc/new_branch_16_01_2019
Clean code and add translation
2019-01-16 13:17:05 +01:00
Philippe GRAND
c743b7803e Clean code and add translation 2019-01-16 13:15:10 +01:00
Laurent Destailleur
f4dd8a4e50 Update myobject_card.php 2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422 simplification 2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb linl back to list if cancelled on create 2019-01-16 12:47:31 +01:00
Laurent Destailleur
8b2c4fbf82
Merge pull request #10321 from bafbes/abb80046
link back to list if cancelled on create
2019-01-16 12:46:51 +01:00
Laurent Destailleur
2ce5c89a14
Update myobject_card.php 2019-01-16 12:46:14 +01:00
Laurent Destailleur
c357cb8c4e Clean code 2019-01-16 12:42:54 +01:00
Laurent Destailleur
3e86ec83e2
Merge pull request #10335 from ptibogxiv/patch-104
NEW add page to setup opening hours of the company
2019-01-16 12:21:07 +01:00
Laurent Destailleur
346028c8d5
Merge pull request #10340 from atm-quentin/FIX_Credit_Note_Free_Line
FIX credit note can have negative value
2019-01-16 12:11:21 +01:00
Laurent Destailleur
30ea978130
Merge pull request #10339 from a-schild/develop
Fix for issue #10333
2019-01-16 12:07:09 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
atm-quentin
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +01:00
Laurent Destailleur
1f87b8bb18 FIX Position of price symbol (before) for nl_NL 2019-01-16 01:54:08 +01:00