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

51727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a2817049c9 Fix must show warning only if threshold defined. 2016-02-20 03:34:56 +01:00
Ion Agorria
fc8f1272d2 Fix line fetch not converting dates 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2016-02-20 02:34:01 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
12e6b52131 Merge pull request #4654 from aspangaro/3.9-p12 
Fixed: Members - Problem of tab & missing language file
 2016-02-20 02:28:48 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
aspangaro
d77a8bddcf Fixed: Members - Problem of tab & missing language file 2016-02-19 07:39:14 +01:00
Laurent Destailleur
cc524c8180 Fix bad picto 2016-02-19 04:41:29 +01:00
Laurent Destailleur
79bc7cf085 Fix showing description 2016-02-19 04:05:08 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00
Laurent Destailleur
b70f2f329c Fix bad position of form 2016-02-19 03:59:22 +01:00
Laurent Destailleur
9e11fd988d Fix: color of category when showing full path must use color of last 
element of path
 2016-02-19 03:32:02 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All 
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
 2016-02-19 02:41:00 +01:00
Laurent Destailleur
3b5ce32cb0 Code comment 2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580 Fix code comment 2016-02-19 01:45:52 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
Laurent Destailleur
0c11d9e794 Merge pull request #4651 from defrance/patch-102 
Left a space between clone and $object
 2016-02-18 17:23:17 +01:00
Laurent Destailleur
b269e997c1 Merge pull request #4650 from GPCsolutions/3.8-4649 
Fix #4649 Wrong parameters order
 2016-02-18 17:17:35 +01:00
BENKE Charlie
9fd22722ff left a space between clone and $object 2016-02-18 15:18:47 +01:00
Raphaël Doursenaud
dfe7c6f06f Fix #4649 Wrong parameters order 2016-02-18 12:21:11 +01:00
Laurent Destailleur
1a12eb33d6 Merge pull request #4639 from grandoc/3.9 
[quality] : better help
 2016-02-18 00:31:38 +01:00
Laurent Destailleur
5d2c189e0e Fix bad place of table 2016-02-17 23:45:25 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may 
be module is disabed). I replace with a message to choose list.
 2016-02-17 22:33:02 +01:00
philippe grand
03b9b65d93 [quality] : better help 2016-02-16 16:45:19 +01:00
Laurent Destailleur
14fb2c914a Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:41:55 +01:00
Laurent Destailleur
d8e173af03 Fix regression (class not found, css on hover broken) with try to manage 
contrast on categories.
 2016-02-16 15:01:28 +01:00
Laurent Destailleur
6c7fc55988 Merge pull request #4636 from aternatik/label_cat 
FIX : check contrast of link when using background color for category
 2016-02-16 13:59:03 +01:00
Laurent Destailleur
18ab1ab63a Merge pull request #4634 from hregis/3.8_bug 
Fix: issue when bank module is disabled
 2016-02-16 13:57:24 +01:00
jfefe
841145678d Always check links color when background color is set onto category 2016-02-16 12:56:57 +01:00
jfefe
134c9d13bc FIX : check contrast of link when using background color for category 2016-02-16 12:45:18 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Laurent Destailleur
816195cb43 Merge pull request #4600 from aspangaro/3.9-p11 
Modifiy menu for accountancy module - New balance feature
 2016-02-15 13:55:51 +01:00
Laurent Destailleur
be77887477 Merge pull request #4628 from aspangaro/3.8-p2 
Fixed: Correct problem of rights beetween tax and salaries module
 2016-02-15 13:50:06 +01:00
Laurent Destailleur
353fa7c2fc Little cleaning on how options ar shown 2016-02-15 07:12:23 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-15 01:19:57 +01:00
Laurent Destailleur
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-02-15 01:18:59 +01:00
Laurent Destailleur
f1c9a6fe48 Merge pull request #4594 from grandoc/3.9 
default sort should be from A to Z
 2016-02-15 00:39:00 +01:00
Laurent Destailleur
0c4d44a86c Merge pull request #4591 from FHenry/3.9 
Accoutancy
 2016-02-15 00:35:24 +01:00
Laurent Destailleur
0d5f30f627 Merge pull request #4589 from frederic34/patch-8 
Update google_oauthcallback.php
 2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9 Merge pull request #4603 from GPCsolutions/3.9-4597 
FIX #4597 PHP 7 Uniform Variable Syntax
 2016-02-15 00:32:11 +01:00
Laurent Destailleur
a9aab7545e Merge pull request #4575 from altatof/fix_ttc_display 
FIX: add missing global def for ttc column
 2016-02-15 00:14:34 +01:00
Laurent Destailleur
3925ae0742 Fix: we loose ability to refresh contact list when changing a company on 
contact tab
 2016-02-14 23:54:07 +01:00
Laurent Destailleur
2fd01d71cf Fix #4548 Check on stock enough must be done according to warehouse 2016-02-14 22:20:42 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE 
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
 2016-02-14 21:59:04 +01:00