Commit Graph

829 Commits

Author SHA1 Message Date
Alexandre SPANGARO
9a7307eea8 FIX Missing language key for MAIN_MAXTABS_IN_CARD 2019-12-26 12:01:09 +01:00
Laurent Destailleur
6079a4d159 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/main.lang
2019-10-22 15:25:31 +02:00
Frédéric FRANCE
aeafdae34c Update main.lang 2019-10-17 22:58:47 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
48b4aa4c8d Fix link to ticket 2019-07-19 18:29:33 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
f41606ba15 Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
aaed26b9b0 Update main.lang 2019-06-12 13:04:28 +02:00
Alexandre SPANGARO
39fa4f9365 Fix Missing language key 2019-06-08 21:34:30 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Alexandre SPANGARO
2085958a69 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-23 11:10:07 +02:00
Alexandre SPANGARO
4ba8cf0641 Fix 2019-05-23 11:08:06 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Laurent Destailleur
78c4a3cced Fix lang 2019-05-09 18:33:50 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-09 12:16:43 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
65e931cfe2 Work on email collector 2019-04-08 21:22:10 +02:00
Laurent Destailleur
36aa53e88d Missing trans 2019-04-08 19:40:52 +02:00
Laurent Destailleur
0fd1f9abf6 Show if there is no uploaded files 2019-04-05 19:39:30 +02:00
Laurent Destailleur
0f2dd5dc34 Add label for tax 2019-03-24 23:36:40 +01:00
John BOTELLA
d62db95803 Add trad and icon 2019-03-12 14:22:20 +01:00
Laurent Destailleur
c4e96e9f74 Fix language 2019-02-27 13:48:13 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
f0e56abac7 NEW Module ticket is available as a stable module 2019-02-11 19:16:37 +01:00
Frédéric FRANCE
b041eeae22 first parameter of print_liste_field_titre was translated 2019-02-10 18:11:34 +01:00
Laurent Destailleur
9d03f4b228 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 18:17:02 +01:00
Laurent Destailleur
b83ff06db8 FIX #10416 No need of another option 2019-02-01 17:00:04 +01:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
Laurent Destailleur
22d4afbb62 Missing trans 2019-01-10 01:54:06 +01:00
Laurent Destailleur
78460d2f60 Merge pull request #10257 from torvista/langs-en_US
langs-en_US
2018-12-22 18:33:37 +01:00
Laurent Destailleur
afee39ea68 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 12:09:27 +01:00
Laurent Destailleur
391f916bd5 Fix trans 2018-12-21 10:21:56 +01:00
torvista
2ff35895b6 minor improvements
new constants for missing direct debit terms
2018-12-20 23:36:35 +01:00
torvista
9f9a468f6a more fine tuning 2018-12-19 16:22:27 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
Laurent Destailleur
2fafef6b7d Merge branch 'develop' into lang-en_US 2018-12-15 12:11:22 +01:00
torvista
6f5f4bd3de added latest Develop edits 2018-12-14 20:33:07 +01:00
torvista
805c184163 more supplier->vendor found!
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
2018-12-14 20:17:22 +01:00
Laurent Destailleur
83efdee7d3 Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
torvista
1c7189ed40 supplier->vendor
suppliers->vendors
2018-12-13 22:24:45 +01:00
torvista
351274d85d 1) Standardization of use of "third party"
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
2018-12-11 10:08:19 +01:00
Laurent Destailleur
94c2d7194c Trans Website 2018-11-30 12:41:35 +01:00
Laurent Destailleur
1d2c2a23ef Fix look and feel v8 2018-11-25 11:57:19 +01:00
Laurent Destailleur
3bb7726101 Revert "Fix translation"
This reverts commit 8de30c12d8.
2018-11-22 13:22:05 +01:00
Laurent Destailleur
8de30c12d8 Fix translation 2018-11-22 13:19:25 +01:00