Commit Graph

46823 Commits

Author SHA1 Message Date
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
c2bc2c9ea6 Solves #2542 Bug: Contracts store localtax preferences
Conflicts:
	htdocs/compta/facture.php
2015-04-07 20:10:27 +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
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
Laurent Destailleur
8c6584f658 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-06 13:11:55 +02:00
Laurent Destailleur
aca025c9eb Update doc 2015-04-06 13:11:33 +02:00
Laurent Destailleur
0155d75f27 Merge pull request #2554 from aspangaro/develop-adherent
Module member: move field note to note_private & typo
2015-04-06 12:58:52 +02:00
Laurent Destailleur
e2508287bd Merge pull request #2537 from marcosgdf/cq
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-06 12:37:52 +02:00
Laurent Destailleur
323cc53553 Merge pull request #2556 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-04-06 12:26:01 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Laurent Destailleur
828dc2c9f4 Fix code standard 2015-04-06 12:22:52 +02:00
Laurent Destailleur
a5c74a7d95 Clean code 2015-04-06 11:59:58 +02:00
Laurent Destailleur
2627662f5c fix value ust be a string 2015-04-06 11:36:31 +02:00
Laurent Destailleur
8fb14b122a Fix phpcs 2015-04-06 11:28:06 +02:00
Laurent Destailleur
f40bb3e6aa fix phpcs 2015-04-06 11:05:16 +02:00
aspangaro
03b1db138e Debug 2015-04-06 08:20:23 +02:00
aspangaro
ca82c2f36d Merge remote-tracking branch 'Upstream/develop' into develop-adherent 2015-04-06 07:53:04 +02:00