Commit Graph

44476 Commits

Author SHA1 Message Date
Marcos García de La Fuente
496a3fcaae Removed unused action of card.php 2014-11-23 17:06:51 +01:00
Marcos García de La Fuente
b76a58b898 Fixed typo 2014-11-23 17:03:25 +01:00
Marcos García de La Fuente
231ad04fbd Highlight of required fields should be only in edit mode 2014-11-23 16:58:46 +01:00
Marcos García de La Fuente
26ab5bdd43 Merge branch 'develop' into bookmarks 2014-11-23 16:54:59 +01:00
Marcos García de La Fuente
373bdcf5d7 Fixed problem when editing a bookmark and failing 2014-11-23 16:54:09 +01:00
Laurent Destailleur
90dcb44076 Merge pull request #2080 from marcosgdf/bug-1661
Fixed[ bug #1661 ] Bookmarks list "Target" translation missing
2014-11-23 16:54:09 +01:00
Laurent Destailleur
9c107790e4 Merge pull request #2079 from marcosgdf/bug-1705
Fixed [ bug #1705 ] Members statistics menu entry strange target
2014-11-23 16:53:54 +01:00
Laurent Destailleur
5b4241582a Merge pull request #2076 from marcosgdf/bug-1658
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
2014-11-23 16:52:55 +01:00
Laurent Destailleur
245a06d433 Merge remote-tracking branch 'origin/3.7' into develop 2014-11-23 16:52:15 +01:00
Laurent Destailleur
1635f725c8 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-11-23 16:51:25 +01:00
Laurent Destailleur
1f986014f1 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-23 16:50:08 +01:00
Laurent Destailleur
99e7004bb6 Merge pull request #2073 from frederic34/patch-8
Fix: W3C. form into table is forbidden.
2014-11-23 16:49:33 +01:00
Laurent Destailleur
7678f9b13c Merge pull request #2069 from frederic34/patch-4
Fix 1662 Search filter display discrepancy
2014-11-23 16:48:59 +01:00
Laurent Destailleur
becbf9eada Merge pull request #2068 from frederic34/patch-3
Fix 1667 Pagination is only partially shown in supplier references list
2014-11-23 16:48:44 +01:00
Laurent Destailleur
bd8391163a Merge pull request #2067 from frederic34/patch-2
Fix bug 1692 Can't update phone_pro with the contact webservice
2014-11-23 16:48:33 +01:00
Laurent Destailleur
989cd87446 Merge pull request #2066 from altatof/fix_margin_recap
FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line
2014-11-23 16:48:21 +01:00
Marcos García de La Fuente
52eb4943e2 Fixed entities problems in error messages when creating a bookmark 2014-11-23 16:46:48 +01:00
Laurent Destailleur
b83e4cffb0 Debug travis 2014-11-23 16:45:33 +01:00
Marcos García de La Fuente
c40be71dcd Fixed design of new bookmark page 2014-11-23 16:44:49 +01:00
Marcos García de La Fuente
eb569fe235 Fixed [ bug #1712 ] Unable to add a social charge 2014-11-23 16:43:52 +01:00
Laurent Destailleur
ed71526fc3 Merge pull request #2078 from marcosgdf/bug-1712
Fixed [ bug #1712 ] Unable to add a social charge
2014-11-23 16:42:38 +01:00
Laurent Destailleur
89e3e3bee3 Debug travis 2014-11-23 16:38:59 +01:00
Laurent Destailleur
ef2c424f8b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	.travis.yml
2014-11-23 16:36:00 +01:00
Laurent Destailleur
26a652814f Debug travis pb 2014-11-23 16:34:56 +01:00
Laurent Destailleur
be2fe19e03 Debug travis pb 2014-11-23 16:31:37 +01:00
Laurent Destailleur
d2762f5077 Debug travis pb 2014-11-23 16:28:25 +01:00
Marcos García de La Fuente
a1cc95d352 Fixed design of edit page of a bookmark 2014-11-23 16:26:55 +01:00
Marcos García de La Fuente
4f83eea3cf Fixed[ bug #1661 ] Bookmarks list "Target" translation missing 2014-11-23 16:22:38 +01:00
Marcos García de La Fuente
bd765ef3ae Fixed [ bug #1705 ] Members statistics menu entry strange target 2014-11-23 16:17:09 +01:00
Marcos García de La Fuente
7d71974362 Fixed [ bug #1712 ] Unable to add a social charge 2014-11-23 16:14:12 +01:00
Laurent Destailleur
3f06274d5e Debug travis pb 2014-11-23 15:54:59 +01:00
Marcos García de La Fuente
835b359179 Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts 2014-11-23 15:42:29 +01:00
Laurent Destailleur
6cb3bafd93 Debug travis pb 2014-11-23 15:41:13 +01:00
Laurent Destailleur
1c1e2ed246 Better comment 2014-11-23 13:19:28 +01:00
Laurent Destailleur
3aef9d928b Fix: W3C 2014-11-23 13:14:03 +01:00
Frédéric FRANCE
de48a04844 Fix: W3C. form into table is forbidden. 2014-11-23 12:53:00 +01:00
Laurent Destailleur
97a6bd842d Minor fixes. 2014-11-23 12:39:53 +01:00
Frédéric FRANCE
ffd435d9ff Fix 1662 Search filter display discrepancy 2014-11-23 01:20:02 +01:00
Frédéric FRANCE
b2a1408d8e Fix 1667 Pagination is only partially shown in supplier references list 2014-11-23 00:51:13 +01:00
Frédéric FRANCE
891f8d9442 Fix bug 1692 Can't update phone_pro with the contact webservice 2014-11-22 19:02:15 +01:00
Laurent Destailleur
2a56a19b7d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:59:12 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
02e18bc03d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:29:06 +01:00
Laurent Destailleur
8b545af325 Merge pull request #1982 from atm-alexis/feature_agenda_files_on_card_view
add files view into agenda card
2014-11-22 16:24:09 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
2f4de2ef75 Merge pull request #2016 from altatof/3.5
FIX: copy extrafields when creating order from propale and creating
2014-11-22 16:02:13 +01:00
Laurent Destailleur
31a5a46ffa Merge pull request #2022 from asirinelli/3.7
Add EIRL in llx_c_forme_juridique
2014-11-22 16:00:32 +01:00
Andrelec1
667f1bf497 Fix : more than 1000 holidays
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
2014-11-22 15:59:51 +01:00
Laurent Destailleur
3d968aa432 Merge pull request #2027 from Devensys/Develop-FixGRHconge1
FIX bug in GRH module
2014-11-22 15:59:12 +01:00