Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 35 Branches 179 Tags 1.7 GiB
afee39ea68
Commit Graph

8590 Commits

Author SHA1 Message Date
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
4859d944d8 Sync transifex 2018-12-21 12:09:03 +01:00
Laurent Destailleur
391f916bd5 Fix trans 2018-12-21 10:21:56 +01:00
Laurent Destailleur
ae6596cac7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:29 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
c3eb131054 Debug ticket module 2018-12-18 13:30:22 +01:00
Laurent Destailleur
48162db33d FIX Rename of image file lose the thumbs 2018-12-17 20:19:11 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f Debug website module 2018-12-17 17:29:04 +01:00
Laurent Destailleur
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
e06b06c788 Work on cash fence 2018-12-17 10:37:56 +01:00
Laurent Destailleur
cbb5e3bbe9 Better translation 2018-12-17 03:31:20 +01:00
Laurent Destailleur
af4405c669 FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE 2018-12-16 20:29:08 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Juanjo Menent
6ce0d3e279 FIX: Vendor translations are in english 2018-12-16 11:16:12 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985 Work on cash fence 2018-12-15 19:58:43 +01:00
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894 Typo 2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
Laurent Destailleur
69c666162f
Update projects.lang 2018-12-15 12:13:54 +01:00
Laurent Destailleur
2fafef6b7d
Merge branch 'develop' into lang-en_US 2018-12-15 12:11:22 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop 
Add a link for compta-files.php in the accountancy leftmenue
 2018-12-15 12:09:42 +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
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
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
Juanjo Menent
22c34bd656 Fix: MenuBankCash Translation is in english in es_ES 2018-12-12 12:09:07 +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