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

8901 Commits

Author SHA1 Message Date
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
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
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
3925ae0742 Fix: we loose ability to refresh contact list when changing a company on 
contact tab
 2016-02-14 23:54:07 +01:00
abb
834f0b20ae fix:no transaction in this place 2016-02-14 20:55:09 +01:00
abb
2f99273734 fix:no transaction in this place 2016-02-14 20:51:36 +01:00
Laurent Destailleur
666a3d907d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-14 20:48:39 +01:00
Laurent Destailleur
b7ae5bac6f Fix: The text "All" is not appropriate. 2016-02-14 20:48:25 +01:00
Laurent Destailleur
d973596601 Merge pull request #4587 from frederic34/patch-7 
Update modOauth.class.php
 2016-02-14 12:21:03 +01:00
Laurent Destailleur
969314e731 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:32 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
Laurent Destailleur
51cc252d4a Fix: submit was no more possible from keyboard 2016-02-11 15:47:47 +01:00
aspangaro
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
philippe grand
d02f8393dc Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-02-10 11:43:33 +01:00
Florian HENRY
ef7e245432 g 2016-02-09 19:23:17 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Laurent Destailleur
7ef0415aca Small per enhancement 2016-02-09 15:57:24 +01:00
Frédéric FRANCE
c28f977e02 Update printgcp.modules.php 2016-02-09 14:12:34 +01:00
Frédéric FRANCE
51da5ea1f0 Update printgcp.modules.php 2016-02-09 14:07:54 +01:00
Frédéric FRANCE
73041b0be5 Update google_oauthcallback.php 2016-02-09 14:05:05 +01:00
Frédéric FRANCE
5dd016c3bc Update modOauth.class.php 2016-02-08 17:55:29 +01:00
philippe grand
a15d03a676 fix : Strict Standards: Only variables should be passed by reference 2016-02-08 10:06:32 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for 
search was not visible.
 2016-02-07 02:55:56 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
Laurent Destailleur
7044e62afa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064 All messages separated with , into errorsToString 2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6 Merge pull request #4573 from altatof/fix_ttc 
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
 2016-02-05 18:34:45 +01:00
Christophe Battarel
f0aef88589 better fix 2016-02-05 13:49:19 +01:00
Christophe Battarel
36c7697b63 FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 
3.7
 2016-02-05 13:43:06 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +01:00
Frédéric FRANCE
a656607122 Update CMailFile.class.php 2016-02-04 17:12:58 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
Laurent Destailleur
43ac8b72a3 Merge pull request #4542 from aspangaro/3.9-p9 
New accountancy menu for auguria
 2016-02-02 15:32:32 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
aspangaro
2fa01a1754 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9 2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 15:35:28 +01:00
Laurent Destailleur
5212303208 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00