Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

125 Commits

Author SHA1 Message Date
Laurent Destailleur
00df21cf17 Trans 2019-10-07 13:48:09 +02:00
Laurent Destailleur
2bb55200f7 Clean user card 2019-10-07 13:46:13 +02:00
Maxime Kohlhaas
848b9cc57a Translations 2019-10-05 22:24:59 +02:00
Laurent Destailleur
f54eb78260 NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
Laurent Destailleur
c4e96e9f74 Fix language 2019-02-27 13:48:13 +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
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
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
8a928a72fa Sync transifex 2018-10-13 14:03:32 +02:00
Laurent Destailleur
7273cb97b2 Fix trans 2018-07-18 14:32:51 +02:00
Steve
2cf28e055b more minor grammar corrections 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/companies.lang
	htdocs/langs/en_US/exports.lang
	htdocs/langs/en_US/mails.lang
	htdocs/langs/en_US/products.lang
	htdocs/langs/en_US/sms.lang
 2018-07-16 09:43:19 +02:00
Laurent Destailleur
eb88f1e5c9 Fix look and feel v8 2018-06-23 12:41:03 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
6cae36cc33 NEW Add key __USER_REMOTE_IP__ into available substitution variables 2018-01-26 17:23:30 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if 
there is several vat line with same rate.
 2017-03-04 22:27:44 +01:00
Laurent Destailleur
0a797cd12e Fix us terms. 2017-02-07 20:08:15 +01:00
Laurent Destailleur
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
c45c24f80c FIX Must use external link into a forged email content. 2016-11-08 23:18:43 +01:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
arnaud
c904b8030c Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD 
Conflicts:
	htdocs/langs/en_US/users.lang
 2016-09-27 15:25:29 +02:00
arnaud
b717d530cd NEW User date of employment added 2016-09-27 15:16:16 +02:00
Laurent Destailleur
4d1885eb59 Fix: restore logout and logged translation key 2016-07-27 17:00:14 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
aspangaro
6a12cdc876 New: Add User accountancy code in export 2016-01-31 08:18:47 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:51:49 +01:00
Raphaël Doursenaud
91ce70a6e9 FIX #4081 Added missing translation 2015-11-23 17:25:10 +01:00
Laurent Destailleur
7b2fbdd638 FIX Can't change the admin with default setup 2015-10-05 10:04:34 +02:00
Laurent Destailleur
331ebbdd73 Fix behaviour on grey/visible menu must be same everywhere on 
application.
 2015-06-04 11:42:24 +02:00
Laurent Destailleur
d39dbe66c8 Fix: Removed duplicate entrie into language files 
Renamed tool so all script to run before release start with "fix".
 2014-11-30 14:51:57 +01:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Laurent Destailleur
23eee1b83a New: Add hourly and daily amount on user card. Add weekly working hours 
and salary on user card.
 2014-09-13 17:41:26 +02:00
Laurent Destailleur
42008ae8cb Fix: Bad translation 2014-08-03 11:35:35 +02:00
Laurent Destailleur
7ee1388582 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-04 12:22:10 +02:00
Marcos García de La Fuente
b70a090de2 Corrected English typo 2014-07-02 19:10:17 +02:00
aspangaro
e03be4f6ed HRM Area - Typo & presentation 2014-04-27 04:08:34 +02:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 2014-03-27 12:04:03 +01:00
Laurent Destailleur
66e941d0c1 Fix: Some translation were lost 2013-10-25 11:22:56 +02:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
4eb37abed9 New: Translate the email to change password. 2013-08-25 06:53:59 +02:00