lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,867 Commits 43 Branches 150 Tags 886 MiB
ee252f549a
Commit Graph

55867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
geoffrey.girard
0a5ded20a3 FIX extrafield cloned on project clone 2016-06-24 15:27:47 +02:00
Laurent Destailleur
0bf0937cc6 FIX: disabled templates must be not visible. 2016-06-24 13:08:34 +02:00
Laurent Destailleur
e144df759c FIX forced bank account was lost on proposal 
Fix Invoice was using duplicated bugged code for pdf removal link.
 2016-06-24 12:50:50 +02:00
gauthier
7b1f9eeb16 FIX : lang useless because of dorade model deletion 2016-06-24 12:44:36 +02:00
gauthier
1233c44333 FIX : hidden configuration on pdf rouget for amount ht display to avoid using new model 2016-06-24 12:39:54 +02:00
Laurent Destailleur
e8eee05962 Cleaner css 2016-06-24 03:05:51 +02:00
Laurent Destailleur
3b38e5a870 FIX Withdraw request should not be possible if amount is negative. 2016-06-24 03:00:34 +02:00
Laurent Destailleur
453c6264bf FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly 2016-06-24 02:19:41 +02:00
Laurent Destailleur
eddab57f32 Minor css fix 2016-06-24 01:00:37 +02:00
Laurent Destailleur
227bdb9838 FIX extrafields was not visible on tab "subscription" 
FIX Link between membership and invoice was not saved
 2016-06-24 00:45:35 +02:00
Laurent Destailleur
d72d22cda4 Fix confusing translation 2016-06-23 23:22:30 +02:00
Laurent Destailleur
2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:05:00 +02:00
Laurent Destailleur
f6119cfee8 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:03:08 +02:00
Laurent Destailleur
d78eb4495e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-06-23 20:55:31 +02:00
Laurent Destailleur
9b50150fe8 FIX #5380 2016-06-23 20:54:04 +02:00
Laurent Destailleur
79c3f9f8cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-23 20:50:48 +02:00
Laurent Destailleur
2988a38786 Merge pull request #5392 from hregis/develop_origin 
Fix: missing rename field "shortname" to "ref"
 2016-06-23 20:24:20 +02:00
Laurent Destailleur
05cbf37aca Merge pull request #5387 from frederic34/patch-8 
FIX Using parm instead of this in function pdfGetHeightForHtmlContent
 2016-06-23 20:22:17 +02:00
Laurent Destailleur
c53429dcae Merge pull request #5391 from atm-florian/3.9 
FIX : Translate group perms as it is done into user perms
 2016-06-23 20:20:55 +02:00
Laurent Destailleur
f8e9ec7ce9 Merge pull request #5395 from grandoc/develop 
internationalization of code comment
 2016-06-23 20:20:28 +02:00
Laurent Destailleur
91e13d23fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-23 20:20:16 +02:00
Laurent Destailleur
96ece1afa0 Merge pull request #5396 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2016-06-23 20:20:04 +02:00
Scrutinizer Auto-Fixer
23620e3133 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1 Fix doxygen errors 2016-06-23 20:19:35 +02:00
philippe grand
0c5eaddf7a internationalization of code comment 2016-06-23 19:56:17 +02:00
Xebax
ea3094cad1 Improve the code in WebservicesInvoicesTest. 
The third party needed for the tests is created in setUpBeforeClass()
and not in the constructor to avoid creating several objects (the
constructor is called for each test).
 2016-06-23 17:20:22 +02:00
Regis Houssin
25631b236b Fix: missing rename field "shortname" to "ref" 2016-06-23 16:47:21 +02:00
florian HENRY
c67fa41298 FIX : Translate group perms as it is done into user perms 2016-06-23 16:29:06 +02:00
florian HENRY
b43d4bba68 NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping 
mail template
 2016-06-23 11:31:15 +02:00
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
d0f03d9ff6 Merge pull request #5376 from atm-florian/develop 
FIX php warning method declaration
 2016-06-23 10:02:13 +02:00
Laurent Destailleur
7f0ed90652 Merge pull request #5385 from simnandez/3.9 
FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2016-06-23 10:01:34 +02:00
Laurent Destailleur
0662be0638 Merge pull request #5381 from grandoc/develop 
internationalization of code comment
 2016-06-23 10:01:00 +02:00
Laurent Destailleur
6cedec2d63 Merge pull request #5384 from frederic34/patch-8 
Update mysqli.class.php
 2016-06-23 09:57:36 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
7f0062cb4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-22 20:09:31 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should 
not.
 2016-06-22 20:08:29 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
7ea16ac3fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2016-06-22 15:31:56 +02:00
Laurent Destailleur
f72ff5ac93 FIX Responsive errors due to boxes 2016-06-22 15:23:48 +02:00
florian HENRY
dfba0638ab continue accoutancy and PG SQL compatibility 2016-06-22 11:28:21 +02:00
Xebax
e12e1980fc REST API: Add comments in the @deprecated tags. 2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d REST API: Bring back the existing API (for backward compatibility). 
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
 2016-06-22 10:08:54 +02:00
Frédéric FRANCE
375ce04076 Update mysqli.class.php 2016-06-22 09:53:02 +02:00
florian HENRY
e897700bb2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-06-22 08:41:35 +02:00
Xebax
9e9e224c46 REST API: fix deleting a product/service. 
The global variable $user must be set before calling the
Product::delete() method else the check of permissions fails.
 2016-06-21 23:08:22 +02:00
Xebax
4a0d554986 Revert "REST API: fix deleting a product/service." 
This reverts commit d7c8a466b1.
 2016-06-21 22:54:38 +02:00
philippe grand
cc4fe87e13 internationalization of code comment 2016-06-21 17:00:52 +02:00