2
0
forked from Wavyzz/dolibarr
Commit Graph

47328 Commits

Author SHA1 Message Date
Laurent Destailleur
0e2bc5608d Merge pull request #2578 from braito4/patch-1
minor bug drag and drop total line in tasks list
2015-04-09 18:30:59 +02:00
Laurent Destailleur
3ee2790737 Always sho project info when opening task card 2015-04-09 16:26:21 +02:00
Laurent Destailleur
e01e0faeef Can reopen to edit supplier order once ordered 2015-04-09 16:15:52 +02:00
Laurent Destailleur
ed6f2e9386 Fix error management 2015-04-09 15:14:50 +02:00
braito4
914b324a67 minor bug drag and drop total line in tasks list 2015-04-09 10:37:54 +02:00
Laurent Destailleur
f6c2472d92 fix var not declared 2015-04-08 21:50:17 +02:00
Laurent Destailleur
275724e7d6 Merge remote-tracking branch 'origin/3.7' into develop 2015-04-08 21:36:30 +02:00
Laurent Destailleur
ddde869ca4 Sync transifex 2015-04-08 21:35:27 +02:00
Laurent Destailleur
c4daca2bac Fix #1682 2015-04-08 21:34:04 +02:00
Laurent Destailleur
7dd1b8beda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-08 20:56:07 +02:00
Laurent Destailleur
e3bbbaf2e1 Comments 2015-04-08 20:52:18 +02:00
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
Laurent Destailleur
bb83eb0f68 Merge pull request #2561 from frederic34/patch-5
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 23:50:17 +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
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +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
35a6ed90a0 Solves #2542 Bug: Contracts store localtax preferences 2015-04-07 20:02:12 +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
Juanjo Menent
345b609ff0 Closes #2545 Bug: Missing object_margin.png in Amarok theme 2015-04-07 18:41:40 +02:00
Frédéric FRANCE
06c749942a Update index.php 2015-04-07 18:40:19 +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
Frédéric FRANCE
7a2942684c Fix #2559 Bug: Untranslated "Total" in Bank module 2015-04-07 12:45:25 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00