Commit Graph

6714 Commits

Author SHA1 Message Date
Laurent Destailleur
9e83699193 Merge branch 'develop' into new_branch_31_10_2018 2018-12-14 14:27:35 +01:00
Laurent Destailleur
55487da03e Merge branch 'develop' into langs_en_US 2018-12-14 11:09:25 +01:00
torvista
1c7189ed40 supplier->vendor
suppliers->vendors
2018-12-13 22:24:45 +01:00
torvista
2abb2f054d Fix conflict 2018-12-11 23:12:08 +01:00
torvista
1226868bd9 missed one 2018-12-11 10:36:36 +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
434cf2e046 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 09:58:14 +01:00
Laurent Destailleur
e2a575e547 Fix use of external url in iframes 2018-12-10 18:44:45 +01:00
Laurent Destailleur
6105bb2bb6 Fix: difference between text and url into external web site module 2018-12-10 18:10:57 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Laurent Destailleur
f3a67d6c3f FIX Show warning when trying to create task on closed project 2018-12-10 15:06:54 +01:00
Laurent Destailleur
dbee87aa9d Trans 2018-12-10 13:10:28 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
2621af96d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
2018-12-07 19:08:53 +01:00
Laurent Destailleur
a9a191819f Work on billing time spent 2018-12-06 21:25:28 +01:00
Laurent Destailleur
163cac5349 Trans lead 2018-12-06 20:25:22 +01:00
Laurent Destailleur
275eeca135 Trans 2018-12-04 13:09:58 +01:00
Alexandre SPANGARO
0c6f6b80cb Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-03 21:16:53 +01:00
Laurent Destailleur
7c46ace042 Merge pull request #10153 from atm-maxime/fix_user_photo
Fix user photo path
2018-12-02 17:07:14 +01:00
Juanjo Menent
aa2ecd4b73 Merge pull request #10162 from aljawaid/aljawaid-ecm_translations
FIX: Add Missing Translation Strings into ecm.lang
2018-12-02 15:51:40 +01:00
IJ
30f1925177 FIX: Add Missing Translation Strings into ecm.lang
- ECMDocsByHolidays
- ECMDocsBySupplierProposals
2018-12-02 12:29:52 +00:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +01:00
Maxime Kohlhaas
72225f6524 Migration of user photo paths 2018-12-01 23:57:15 +01:00
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
Inovea Conseil
6201962dcf Fix missing translation 2018-11-30 23:27:05 +01:00
Laurent Destailleur
94c2d7194c Trans Website 2018-11-30 12:41:35 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Laurent Destailleur
3c0ff40e43 Fix trans 2018-11-29 00:41:12 +01:00
Laurent Destailleur
0b6aaccfcc sync transifex 2018-11-27 16:35:47 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Laurent Destailleur
71bcabd8eb Missing trans 2018-11-27 10:23:58 +01:00
Laurent Destailleur
611569f639 Add missing translation 2018-11-26 11:18:01 +01:00
Laurent Destailleur
1d2c2a23ef Fix look and feel v8 2018-11-25 11:57:19 +01:00
Laurent Destailleur
5bd9c14929 Update demo data for 8.0 and 9.0 2018-11-23 14:05:45 +01:00
Laurent Destailleur
ea7c77d788 Trans 2018-11-23 11:09:27 +01:00
Laurent Destailleur
a06b032c23 fix trans 2018-11-23 10:53:04 +01:00
Laurent Destailleur
97af22369d Trans 2018-11-22 13:47:55 +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
Laurent Destailleur
6514b51382 Better help 2018-11-20 21:59:05 +01:00
Laurent Destailleur
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
839428d545 Missing trans 2018-11-19 19:02:00 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
Laurent Destailleur
a179d45afd Remove deprecated translation keys 2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23 Trans 2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1 Sync transifex 2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00