Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 18:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8581 Commits

Author SHA1 Message Date
Alexandre SPANGARO
0509a176ca Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
e024ea9c05 Merge pull request #9146 from grandoc/new_branch_24_07_2018 
Clean and update code
 2018-07-24 21:41:12 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Philippe GRAND
2a6f050e32 Clean and update code 2018-07-24 18:28:56 +02:00
Chl
4995a0feb1 Translation: adding 'Enable' term in main 
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.

Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
 2018-07-24 00:38:48 +02:00
Laurent Destailleur
df7a3598a8 Trans 2018-07-23 10:56:28 +02:00
Laurent Destailleur
2c7029850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2018-07-21 20:28:26 +02:00
Laurent Destailleur
f419964c76 Fix Debug website module 2018-07-20 15:01:50 +02:00
Laurent Destailleur
8247bb683c Debug website module 2018-07-19 21:35:21 +02:00
Laurent Destailleur
7273cb97b2 Fix trans 2018-07-18 14:32:51 +02:00
Laurent Destailleur
19bb8a5091 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2018-07-18 14:12:28 +02:00
Laurent Destailleur
6ad0cd37b0 Translation 2018-07-18 11:57:49 +02:00
Laurent Destailleur
4b044779dc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1 Fix label of copy must not be same 2018-07-17 22:31:28 +02:00
Laurent Destailleur
651ba74007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 15:45:50 +02:00
Laurent Destailleur
37e16b5ff2 Trans 2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-16 11:29:47 +02:00
Laurent Destailleur
d3cc2c81eb Better detail for time elapsed 2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
Laurent Destailleur
3710f95719 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/exports.lang
 2018-07-16 10:01:23 +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
ae76e61885 Merge pull request #9108 from torvista/misc-texts 
more minor grammar corrections
 2018-07-16 09:23:10 +02:00
Steve
bd9149e03b more minor grammar corrections 2018-07-16 07:28:22 +02:00
Laurent Destailleur
a45ac4519a Fix translation 2018-07-15 18:03:31 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
4c363d1d4f Trans 2018-07-10 15:08:51 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
c01975a40b Merge pull request #9084 from torvista/texts-setup-en_US 
Texts corrections /langs/en_US
 2018-07-10 10:41:28 +02:00
Laurent Destailleur
bd1e430a28 Synch transifex 2018-07-09 20:15:14 +02:00
Steve
e45e74a3bd spelling and some grammar corrections to en_US 2018-07-09 17:38:28 +02:00
Laurent Destailleur
e0c3d176ed Merge pull request #9067 from torvista/install-texts-en_US 
spelling and some grammar corrections for installation texts en_US
 2018-07-09 17:11:58 +02:00
Laurent Destailleur
291f149a9b NEW Can set a tooltip help text on extrafields 2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867 Translation 2018-07-08 20:06:24 +02:00
Laurent Destailleur
8ec9257302 Fix translation 2018-07-08 20:03:14 +02:00
Steve
5944c161bc spelling and some grammar corrections for installation texts en_US 2018-07-07 08:41:17 +02:00
Laurent Destailleur
303fb94acb Fix trans 2018-07-06 13:04:37 +02:00
Laurent Destailleur
fb84211714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb Fix label 2018-07-06 12:45:20 +02:00
Laurent Destailleur
2a8f98be65 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:48:26 +02:00
Laurent Destailleur
da7b433cd0 Trans 2018-07-03 12:46:22 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
01e8f78c30 Trans 2018-07-03 09:58:36 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30 Fix translation 2018-07-02 11:47:04 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00