Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

17660 Commits

Author SHA1 Message Date
Laurent Destailleur
86f4e81a6e Merge pull request #10773 from frederic34/patch-2 
Update stats.class.php
 2019-03-08 19:33:40 +01:00
Laurent Destailleur
9c97b2af30 Merge pull request #10769 from altatof/expe 
NEW : add product extrafields to shipping export
 2019-03-08 19:33:09 +01:00
markus
e452a2e31d add bank lib 2019-03-08 18:14:22 +01:00
markus
41c21b88c1 More output 2019-03-08 16:46:08 +01:00
markus
1bf99b81f1 Display more 2019-03-08 16:44:35 +01:00
Markus Welters
fac99ccd98 Merge pull request #2 from countiy/patch-1 
expensereport changed IBAN
 2019-03-08 16:37:04 +01:00
markus
c595dca5e7 fix typo 2019-03-08 16:35:11 +01:00
Rafael Ingenleuf
a505323fe7 expensereport changed IBAN 2019-03-08 16:27:08 +01:00
Rafael Ingenleuf
bcd3921561 expensereport layout changed and IBAN added 2019-03-08 15:36:09 +01:00
John BOTELLA
ccebb8d1a7 Fix travis errors 2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564 Add user friendly behavior 2019-03-08 14:26:06 +01:00
Laurent Destailleur
1a96a7a88f FIX More complete auto setup of barcode module 
Add tooltip help on member setup module
 2019-03-08 11:31:12 +01:00
Alexandre SPANGARO
5d06e53f1b NEW: Accounting - More comprehensive menu 2019-03-08 09:11:56 +01:00
Laurent Destailleur
ebc2289292 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 20:53:16 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
Frédéric FRANCE
d96cc53f97 replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Frédéric FRANCE
1917adb980 Update stats.class.php 
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
 2019-03-07 17:35:02 +01:00
Laurent Destailleur
4ecc1dac56 Merge pull request #10756 from altatof/fp2 
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
 2019-03-07 17:29:10 +01:00
John BOTELLA
218690db00 add css behavior 2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
John BOTELLA
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +01:00
Christophe Battarel
d414e3eb48 add product extrafields 2019-03-07 15:00:48 +01:00
Laurent Destailleur
8d0a8d8263 Merge pull request #10758 from altatof/lf 
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
 2019-03-07 14:18:26 +01:00
Laurent Destailleur
975afd014d Merge pull request #10763 from frederic34/patch-6 
Update eldy.lib.php
 2019-03-07 14:15:53 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
e96f84a3d6 Merge pull request #10765 from altatof/sd8 
FIX : supplier discount was not retrieved when choosing a product
 2019-03-07 13:26:44 +01:00
Laurent Destailleur
0349f9bfaa Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00
Laurent Destailleur
3757fa83fd Merge pull request #10760 from altatof/db 
Avoid doing empty queries
 2019-03-07 13:04:46 +01:00
Laurent Destailleur
daaa4ca0c2 Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed 
PSR2.Classes.PropertyDeclaration.VarUsed
 2019-03-07 12:49:13 +01:00
Laurent Destailleur
8ffab05f67 Merge pull request #10759 from altatof/ml 
NEW : sort list of models alphabetically
 2019-03-07 12:47:50 +01:00
Laurent Destailleur
b4bdbda9f5 Update mysqli.class.php 2019-03-07 12:36:57 +01:00
Laurent Destailleur
fc87090669 Merge pull request #10764 from frederic34/patch-7 
New format type 5 for email
 2019-03-07 12:33:24 +01:00
Laurent Destailleur
d6cf493880 Merge pull request #10768 from altatof/export 
FIX avoid timeout for big export
 2019-03-07 12:31:51 +01:00
Christophe Battarel
a6bb1cf5f6 avoid timeout 2019-03-07 11:27:06 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
 2019-03-07 11:16:24 +01:00
John BOTELLA
5ea5d51247 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 09:41:03 +01:00
John BOTELLA
89157234b7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-07 09:33:11 +01:00
Christophe Battarel
96b8da0d62 fix supllier discount 2019-03-06 22:04:01 +01:00
Frédéric FRANCE
d39b600ff4 Update CMailFile.class.php 2019-03-06 20:29:58 +01:00
Frédéric FRANCE
9e6a5a0b81 Update eldy.lib.php 2019-03-06 18:49:03 +01:00
Christophe Battarel
414bac6fb4 avoid logging empty query 2019-03-06 17:56:43 +01:00
Christophe Battarel
8f8fe0648e fix bad copy paste 2019-03-06 17:24:50 +01:00
Christophe Battarel
4382a26c87 sort list of models alphabetically 2019-03-06 17:21:44 +01:00
Christophe Battarel
ceab55f26b NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER 2019-03-06 17:07:51 +01:00
Frédéric FRANCE
c2070190f2 phpcs fix 2019-03-06 16:51:35 +01:00
Christophe Battarel
4e533b2a91 better constant test 2019-03-06 16:41:28 +01:00
Christophe Battarel
d3bb9d2cc2 add contant DISPLAY_DISCOUNTED_SUPPLIER_PRICE 2019-03-06 16:37:02 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00