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

46837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1dcbf4c39b Merge pull request #2569 from GPCsolutions/contributing 
[Contributing] Added a link to the forum
 2015-04-08 20:45:37 +02:00
Laurent Destailleur
ca7a7a9038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php
 2015-04-08 20:43:51 +02:00
Laurent Destailleur
efb43a7015 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-08 20:40:19 +02:00
Laurent Destailleur
091420f8ae Close #2568 2015-04-08 20:40:01 +02:00
Laurent Destailleur
aaef3a41c0 Short label into table 2015-04-08 19:33:06 +02:00
Laurent Destailleur
1bbecc0912 Restore link to stock for products. 2015-04-08 19:26:36 +02:00
Raphaël Doursenaud
742b50b532 [Contributing] Added a link to the forum 2015-04-08 17:58:40 +02:00
Laurent Destailleur
0987aa1c74 Bad trans key 2015-04-08 17:42:28 +02:00
Laurent Destailleur
fc803e7000 Fix permission lost when enabled/disabled module. 2015-04-08 17:33:38 +02:00
Laurent Destailleur
b3355df3bf Fix delivery delay could not be set to unknown 2015-04-08 13:00:03 +02:00
Laurent Destailleur
1efa5bcabd Fix: Avoid duplicate tooltip 2015-04-08 12:44:11 +02:00
Laurent Destailleur
dd48942f1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-08 12:23:11 +02:00
Laurent Destailleur
17fa1ce5b6 Fix #2552 2015-04-08 12:22:52 +02:00
Laurent Destailleur
edd104a6bc Merge pull request #2563 from frederic34/patch-7 
Accounts "from" & "to" need to have same currency
 2015-04-08 11:51:41 +02:00
Laurent Destailleur
15ba6716f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-08 11:50:59 +02:00
Laurent Destailleur
94087f539f Fix style 2015-04-08 11:50:40 +02:00
Laurent Destailleur
6587748188 Merge pull request #2564 from frederic34/patch-8 
Display total with currency code
 2015-04-08 11:41:30 +02:00
Frédéric FRANCE
7f62892609 Display total with currency code 2015-04-08 09:19:41 +02:00
Frédéric FRANCE
856238c876 Accounts "from" & "to" need to have same currency 2015-04-08 09:09:11 +02:00
Laurent Destailleur
369d6915b8 Fix: PHPCS 2015-04-08 00:14:44 +02:00
Laurent Destailleur
bc69703888 Fix phpcs 2015-04-08 00:07:46 +02:00
Laurent Destailleur
f9c8b2e1cf Merge pull request #2560 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2015-04-07 23:56:40 +02:00
Juanjo Menent
1f4a131691 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/product/stock/product.php
 2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
 2015-04-07 20:40:48 +02:00
Juanjo Menent
c2bc2c9ea6 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:10:27 +02:00
Juanjo Menent
1ab70a7086 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:05:56 +02:00
Juanjo Menent
a0de33912e Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:57:45 +02:00
Juanjo Menent
2dfaf08f61 Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:54:38 +02:00
Laurent Destailleur
49e678b9c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-07 18:14:44 +02:00
Laurent Destailleur
547b7d5f91 Fix #2539 2015-04-07 18:14:20 +02:00
Laurent Destailleur
0f4717195d Merge pull request #2562 from frederic34/patch-7 
Add badge
 2015-04-07 18:04:09 +02:00
Frédéric FRANCE
0dc7bc0ddb Add badge 2015-04-07 12:54:10 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
ad50810c7a Fix deprecated code 2015-04-07 02:48:19 +02:00
Laurent Destailleur
c931576e0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-07 02:45:43 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-07 00:45:30 +00:00
Laurent Destailleur
1d6a8a46f1 To clean an int we must use (int) and not trim() 2015-04-07 02:44:30 +02:00
Laurent Destailleur
c25af905a3 Merge pull request #2557 from frederic34/adherent 
Add public note to members
 2015-04-06 21:23:40 +02:00
Laurent Destailleur
8bcf4b0ec9 Merge pull request #2558 from frederic34/patch-5 
Travis fix CMailFile.class.php
 2015-04-06 21:23:08 +02:00
Frédéric FRANCE
85d8d06ca4 Travis fix CMailFile.class.php 2015-04-06 20:02:29 +02:00
Laurent Destailleur
493392d89f Remove warnings 2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452 Fix warning 2015-04-06 19:31:25 +02:00
Laurent Destailleur
2550c6b0af Must exclude draft and abandon into default filter. 2015-04-06 19:22:58 +02:00
Laurent Destailleur
877e60c76f Set default filter 2015-04-06 19:20:11 +02:00
Laurent Destailleur
02e8879d3b NEW Feature to build a merged pdf with all unpaid invoice can work for 
paid invoices.
 2015-04-06 19:11:31 +02:00
frederic34
19b55cb4c1 Add public note to members 2015-04-06 18:58:36 +02:00
Laurent Destailleur
3d161deb17 Fix more robust function 2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0 Status and amount of object should always be visible. 2015-04-06 16:13:23 +02:00
Laurent Destailleur
683f27f6b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-06 14:11:52 +02:00
Laurent Destailleur
fa162cb327 Missing field 2015-04-06 14:11:28 +02:00