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

52275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1a12eb33d6 Merge pull request #4639 from grandoc/3.9 
[quality] : better help
 2016-02-18 00:31:38 +01:00
Laurent Destailleur
7ba6754a55 Fix the missing button to record reception 2016-02-18 00:27:35 +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
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
5268038e00 Minor css enhancement 2016-02-16 22:58:24 +01:00
Laurent Destailleur
1c6bef5a4c NEW Use ellipsis truncation on too large left menu text 2016-02-16 22:45:14 +01:00
Laurent Destailleur
6b9d7763fe Clean code for adding a link to a related object 2016-02-16 22:26:23 +01:00
phf
6d095fce9f Fix replace dol_include_once() function by require_once for internal module 2016-02-16 20:44:23 +01:00
Laurent Destailleur
9796b1b268 Can select number of records into lists 2016-02-16 17:43:05 +01:00
philippe grand
03b9b65d93 [quality] : better help 2016-02-16 16:45:19 +01:00
Raphaël Doursenaud
5bb153877a [Qual] Replaced deprecated dol_clone calls 
With proper clone calls.
 2016-02-16 16:05:30 +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
5fb8068374 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-16 15:39:21 +01:00
Laurent Destailleur
060b59ac6c Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:38:24 +01:00
Laurent Destailleur
f809800e01 Fix sql error 2016-02-16 15:36:54 +01:00
Laurent Destailleur
e0a0817123 Merge pull request #4623 from IonAgorria/dynamic-price-changes 
Dynamic price corretions/changes
 2016-02-16 15:11:02 +01:00
Laurent Destailleur
e3e68dec74 git push origin developMerge branch 'atm-ph-new_add_customer_multicurrency_payment' into develop 2016-02-16 15:06:51 +01:00
Laurent Destailleur
9d418bca7f Merge branch 'new_add_customer_multicurrency_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-16 15:06:39 +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
Laurent Destailleur
9e5f54daaa git push origin developMerge branch 'defrance-patch-100' into develop 2016-02-16 13:55:12 +01:00
Laurent Destailleur
8fb0f8d9d1 Merge branch 'patch-100' of https://github.com/defrance/dolibarr into 
defrance-patch-100

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/user/card.php
 2016-02-16 13:54:56 +01:00
jfefe
841145678d Always check links color when background color is set onto category 2016-02-16 12:56:57 +01:00
Laurent Destailleur
fad09357f4 NEW Show total number of modules into the module list 2016-02-16 12:54:42 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +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
a4628e4bd1 Clean deprecated files 2016-02-16 00:41:30 +01:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351 Add fields to link recurring invoice lines with contract origin when it 
comes from this.
 2016-02-15 16:13:33 +01:00
Laurent Destailleur
d715345c82 Debug 2016-02-15 15:07:57 +01:00
Laurent Destailleur
38f7ac29d7 Show vat of lines on template invoices 2016-02-15 14:49:06 +01:00
Laurent Destailleur
23afb80c82 Can remove status recurring or not of template invoice 2016-02-15 14:42:05 +01:00
Laurent Destailleur
f1f5c48337 Uniformize code 2016-02-15 14:27:35 +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
BENKE Charlie
30a6b546b1 containing function prefer use text values instead numeric 2016-02-15 09:23:36 +01:00
BENKE Charlie
79b79e2acc Update card.php 2016-02-15 09:21:21 +01:00
Laurent Destailleur
d4c3258385 Fix missing field 
Fix bad value for default value of next date
 2016-02-15 07:36:45 +01:00
Laurent Destailleur
353fa7c2fc Little cleaning on how options ar shown 2016-02-15 07:12:23 +01:00
Laurent Destailleur
a138c1503a Little cleaning on how options ar shown 2016-02-15 07:04:07 +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
d0b657f6e7 Fix filter on products with spcific prices on thirdrty tab "customer 
prices"
 2016-02-15 02:15:29 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +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