lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

56393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe
449c679d97 Merge remote-tracking branch 'upstream/develop' into develop 2016-09-06 21:34:31 +02:00
Philippe
21ab4e5c91 No initialisation of the array before filling it. May cause some trouble when fetch is call several times and lines added or deleted 2016-09-06 20:48:20 +02:00
Laurent Destailleur
aa1df53dd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-06 17:42:37 +02:00
Regis Houssin
36110da4bf Fix: Warning: preg_match(): No ending delimiter '/' found 2016-09-06 17:22:56 +02:00
Juanjo Menent
3078e6fa4b FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15) 2016-09-06 13:44:07 +02:00
Laurent Destailleur
10c1f02243 Extrafields for expensereports are visible on cards 2016-09-06 13:39:44 +02:00
Laurent Destailleur
cc9230c07f FIX Columns truncated and translation missing 2016-09-06 13:08:49 +02:00
Juanjo Menent
d2ef56f3f1 Merge remote-tracking branch 'origin/3.9' into 3.9 2016-09-06 13:03:27 +02:00
Juanjo Menent
4e5105c220 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-09-06 13:03:01 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
666c62af04 Fix http into https 2016-09-06 00:59:31 +02:00
Laurent Destailleur
e07f65721a Fix css 2016-09-06 00:58:37 +02:00
Laurent Destailleur
ccd2e31d59 Merge pull request #5700 from atm-florian/dev_createorderfromcontract 
Create order from contract
 2016-09-05 15:55:37 +02:00
Laurent Destailleur
ec99a056ac NEW introduce option PROJECT_DISABLE_PRIVATE_PROJECT and 
PROJECT_DISABLE_PUBLIC_PROJECT
 2016-09-05 15:13:03 +02:00
florian HENRY
ae34ef98f6 Create order from contract 2016-09-05 09:42:34 +02:00
florian HENRY
8319d1f70a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_projectwork 2016-09-05 08:31:40 +02:00
Laurent Destailleur
d1719bad5a Fix ChangeLog 2016-09-05 01:36:06 +02:00
Laurent Destailleur
d4c35b7131 Fix bad translation 2016-09-04 23:45:14 +02:00
Laurent Destailleur
84ec5757a1 Uniformize look and feel 2016-09-04 15:06:34 +02:00
Laurent Destailleur
6da7410c18 Show warning for overwritten translation 2016-09-04 14:58:58 +02:00
Laurent Destailleur
d24045d831 NEW Editing translation GUI become easier with search translation tool. 2016-09-04 14:45:43 +02:00
Laurent Destailleur
e4539be127 FIX sortfield and sortorder parameters output twice in navigation url. 2016-09-04 13:28:37 +02:00
Laurent Destailleur
cb27b01812 Work on feature to find a translation key 2016-09-03 18:47:04 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
13746a3c03 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:37:59 +02:00
Laurent Destailleur
acdce83f9c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
 2016-09-02 22:37:01 +02:00
Laurent Destailleur
aab3b2837a FIX #5589 2016-09-02 22:34:37 +02:00
Laurent Destailleur
eee53998ad Mark function as deprecated #5577 2016-09-02 22:14:15 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
Laurent Destailleur
571aae7026 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 21:52:20 +02:00
Laurent Destailleur
bd90c3a9d0 git push origin developMerge branch 'GPCsolutions-develop-external-logging' into develop 2016-09-02 21:51:42 +02:00
Laurent Destailleur
0e4b4ee321 Merge branch 'develop-external-logging' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging

Conflicts:
	composer.json
 2016-09-02 21:51:25 +02:00
Laurent Destailleur
dc1bc33343 sql syntax 2016-09-02 21:48:02 +02:00
Laurent Destailleur
e19743519b FIX #5660 2016-09-02 21:44:52 +02:00
Laurent Destailleur
78b2e9e4bf FIX #5651 2016-09-02 21:40:07 +02:00
Laurent Destailleur
8c4324d912 FIX #5674 2016-09-02 21:15:48 +02:00
Laurent Destailleur
dc9c2f0ed7 FIX #5687 2016-09-02 21:10:46 +02:00
Laurent Destailleur
4fa94e3a25 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-02 19:25:04 +02:00
Laurent Destailleur
ba76f12a28 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
	htdocs/product/stock/class/mouvementstock.class.php
 2016-09-02 19:24:28 +02:00
Laurent Destailleur
9c8145eb88 Better fix for 416a0892d7 2016-09-02 19:19:13 +02:00
Laurent Destailleur
696b54c6c3 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:50 +02:00
Laurent Destailleur
70de814c3c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:31 +02:00
Laurent Destailleur
9fe6959598 Merge pull request #5588 from GPCsolutions/develop-4608 
FIX #4608 [Debian] Don't hard depend on mysql-server
 2016-09-02 18:57:29 +02:00
Laurent Destailleur
f4ada7f18e Merge pull request #5695 from fappels/4.0_delete_product_lot 
FIX Delete product_lot data when product deleted
 2016-09-02 18:44:21 +02:00
Laurent Destailleur
5c2af9b7bd Merge pull request #5694 from atm-ph/fix_3.8_address_empty 
Fix lost value if use double quote
 2016-09-02 18:42:32 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
d6a4b58a68 Merge pull request #5685 from atm-gauthier/3.8_fix_header_title_commercial_area 
FIX : header title in commercial area
 2016-09-02 18:36:47 +02:00
Laurent Destailleur
570c228ee1 Merge pull request #5692 from fmarcet/3.9 
Fix: An empty variable is used to update multiprice
 2016-09-02 18:24:09 +02:00
Laurent Destailleur
5dc7c9c6e5 Merge pull request #5691 from fappels/3.9_fix_check_lot_dates 
FIX #5642 Ignore time when checking lot dates
 2016-09-02 18:23:04 +02:00