Commit Graph

38496 Commits

Author SHA1 Message Date
Laurent Destailleur
20e76aa4e6 Fixed: Use constant to hide a feature that will probably be broken. Also
it is a superfluous feature.
2014-11-30 02:05:45 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
Laurent Destailleur
7843ed41f3 Fixed: Bad permission 2014-11-29 20:50:05 +01:00
Laurent Destailleur
def4ab5065 Fixed: Missing picto
Fixed: Menu auguria
Fixed: Default label
2014-11-29 20:41:09 +01:00
Laurent Destailleur
b9ea7d4d13 Fix: Stock decrease from POS 2014-11-29 17:38:12 +01:00
Laurent Destailleur
1797569a6d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 16:44:37 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
2014-11-29 13:50:41 +01:00
Laurent Destailleur
278cdf72d6 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
Laurent Destailleur
c7420662e6 Fixed: Module for target emailing must not be visible when modules is
disabled.
2014-11-29 12:40:45 +01:00
Laurent Destailleur
e118d9af22 Fixed: Protection to lock language setup in demo mode was not working 2014-11-29 12:11:12 +01:00
Laurent Destailleur
cdd256e206 Add info to help understand debug 2014-11-29 12:00:42 +01:00
Laurent Destailleur
7f0a01936e Fix a very old bug of conflicth into decrease stock when using point of
sale, not compatible with option defined into stock module.
2014-11-28 20:41:52 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Raphaël Doursenaud
10456f90d9 Language files should not be executable 2014-11-28 16:06:45 +01:00
Raphaël Doursenaud
92b54fd496 Removed deprecated oscommerce language files
Note to transifex sync personnel: you may have to manually remove the file
from Transifex to prevent it from coming back!
2014-11-28 16:03:45 +01:00
Raphaël Doursenaud
953fe6b1f2 CRLF fix 2014-11-28 15:58:23 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Laurent Destailleur
a81c483061 Revert "Update objectline_create.tpl.php"
This reverts commit fdac53bfca.
2014-11-28 02:14:25 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
2014-11-28 02:05:40 +01:00
Marcos García de La Fuente
1c16a2e621 Fixed [ bug #1642 ]: add a free line in contract 2014-11-28 01:15:45 +01:00
Laurent Destailleur
79c8980493 Fix: function at wrong place 2014-11-28 01:13:57 +01:00
Marcos García de La Fuente
5cc015268e Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-28 01:02:59 +01:00
Marcos García de La Fuente
0a0e0e068c Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-28 01:02:44 +01:00
Laurent Destailleur
38062177d3 Doxygen 2014-11-28 00:37:46 +01:00
Laurent Destailleur
232921a506 Fixed: Add option on a not common new feature 2014-11-28 00:34:03 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
Laurent Destailleur
f9953d52f6 Merge pull request #2091 from frederic34/patch-3
Fix 1721 Missing translation on proposal creation
2014-11-28 00:16:44 +01:00
Laurent Destailleur
ae6f458a98 Merge pull request #2092 from frederic34/patch-2
Fix Typo
2014-11-28 00:12:11 +01:00
Laurent Destailleur
02d53aa26f Merge pull request #2093 from frederic34/patch-4
Fix Typo
2014-11-28 00:11:49 +01:00
Laurent Destailleur
b21171303a Merge pull request #2094 from frederic34/patch-5
Fix Typo
2014-11-28 00:11:23 +01:00
Laurent Destailleur
631a98c322 Merge pull request #2095 from frederic34/patch-6
Fix Typo
2014-11-28 00:10:48 +01:00
Laurent Destailleur
61889d2195 Merge pull request #2096 from frederic34/patch-7
Fix Typo
2014-11-28 00:10:24 +01:00
Laurent Destailleur
db5fb1ad9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-28 00:05:02 +01:00
Laurent Destailleur
6843bfcc15 Fix typo 2014-11-28 00:01:59 +01:00
Laurent Destailleur
3af6e048e5 Merge pull request #2101 from frederic34/patch-8
Fix remove </a> not needed
2014-11-27 23:59:05 +01:00
Laurent Destailleur
f36a30f9fe Fixed: W3C. An id must be unique inside a page. 2014-11-27 23:25:29 +01:00
Frédéric FRANCE
5a97ee1f95 Rearrange Help Block in left menu 2014-11-27 23:20:13 +01:00
Laurent Destailleur
8d33a6947b Merge pull request #2105 from frederic34/patch-11
Fix 1733 Homepage boxes close button translation error
2014-11-27 21:51:00 +01:00
Laurent Destailleur
8a8f9aaee3 Merge pull request #2106 from frederic34/patch-12
Fix 1655 Proposal amount not computed in preview
2014-11-27 21:49:43 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
jfefe
1b35c5e77b Missing extrafields management for order webservice 2014-11-27 12:56:10 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Frédéric FRANCE
90b582b1f3 Fix 1733 Homepage boxes close button translation error
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
2014-11-26 16:58:54 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
2014-11-25 21:20:13 +01:00
Frédéric FRANCE
fbdd851875 Fix remove </a> not needed 2014-11-25 18:54:56 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Frédéric FRANCE
911f9c0913 Fix Typo 2014-11-25 01:13:52 +01:00
Frédéric FRANCE
e4517ee0f4 Fix Typo 2014-11-25 01:07:45 +01:00
Frédéric FRANCE
9fb58e06f6 Fix Typo 2014-11-25 01:06:55 +01:00
Frédéric FRANCE
6163635d7c Fix Typo 2014-11-25 01:06:04 +01:00
Frédéric FRANCE
9d813b25d9 Fix Typo 2014-11-25 01:05:01 +01:00
Frédéric FRANCE
f5bc6dc634 Update propal.php 2014-11-24 21:01:55 +01:00
Frédéric FRANCE
81f467661e Update propal.php 2014-11-24 20:58:46 +01:00
Frédéric FRANCE
655dc35628 Update propal.php 2014-11-24 20:57:26 +01:00
Frédéric FRANCE
5dbba380d2 Fix 1721 Missing translation on proposal creation 2014-11-24 20:54:38 +01:00
Laurent Destailleur
ab25b149c5 Fix: Download of user files 2014-11-24 15:40:40 +01:00
Laurent Destailleur
1dbb19e8ef Merge pull request #2058 from defrance69/patch-30
Update objectline_create.tpl.php
2014-11-24 10:57:14 +01:00
Laurent Destailleur
bc1d88d324 Fixed: The visualization of status with mutualized picto was lost, so i
restore old feature to keep same visual for all status and add hidden
option to switch to new.
2014-11-24 01:16:26 +01:00
Laurent Destailleur
29bfe7050d Fix: W3C. 2014-11-24 01:11:30 +01:00
Marcos García de La Fuente
3ab8cff641 Removed unused action of card.php 2014-11-24 01:09:11 +01:00
Marcos García de La Fuente
6304895d75 Fixed typo 2014-11-24 01:05:18 +01:00
Marcos García de La Fuente
601710a4dc Highlight of required fields should be only in edit mode
Conflicts:
	htdocs/bookmarks/card.php
2014-11-24 01:05:01 +01:00
Marcos García de La Fuente
6159591a02 Fixed [ bug #1679 ] Can't sort groups by user count in user groups list 2014-11-24 01:01:33 +01:00
Laurent Destailleur
00031cbdab Merge pull request #2085 from frederic34/patch-2
Put label into div
2014-11-24 00:59:38 +01:00
Laurent Destailleur
ca1a21012e Merge pull request #2086 from aspangaro/3.7-patch1
Patch module resource
2014-11-24 00:58:41 +01:00
Laurent Destailleur
891e39189a Fixed: missing css class 2014-11-23 23:31:35 +01:00
Laurent Destailleur
7a18240d2f Doxygen 2014-11-23 23:22:49 +01:00
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +01:00
Frédéric FRANCE
6cc79c2dd7 Put label into div 2014-11-23 18:42:48 +01:00
Laurent Destailleur
6d2e024d52 Doxygen 2014-11-23 17:53:44 +01:00
Laurent Destailleur
e3710bb61a Merge pull request #2084 from frederic34/patch-3
Fix Typo
2014-11-23 17:47:55 +01:00
Laurent Destailleur
3f655154c5 Merge pull request #2083 from frederic34/patch-2
Fix Typo
2014-11-23 17:47:43 +01:00
Frédéric FRANCE
979d6dffa2 Update /compta/paiement/cheque/list.php 2014-11-23 17:45:18 +01:00
Frédéric FRANCE
ba7500a504 Update /fourn/facture/impayees.php 2014-11-23 17:45:14 +01:00
Frédéric FRANCE
0384f90607 Update /fourn/facture/paiement.php 2014-11-23 17:45:11 +01:00
Frédéric FRANCE
afc87f5445 Update /fourn/commande/list.php 2014-11-23 17:45:07 +01:00
Frédéric FRANCE
99e88c16c4 Update /product/stock/mouvement.php 2014-11-23 17:45:04 +01:00
Frédéric FRANCE
01e6d9fc12 Update /comm/prospect/list.php 2014-11-23 17:45:00 +01:00
Frédéric FRANCE
627e3e0a2b Update /comm/actions/listactions.php 2014-11-23 17:44:57 +01:00
Frédéric FRANCE
199239ac8b Update /accountancy/bookeeping/list.php 2014-11-23 17:44:53 +01:00
Frédéric FRANCE
b6824877e5 Update /accountancy/admin/account.php 2014-11-23 17:44:49 +01:00
Frédéric FRANCE
339415034e Update /compta/facture/impayees.php 2014-11-23 17:44:45 +01:00
Frédéric FRANCE
ccff0f0952 Update /compta/facture/list.php 2014-11-23 17:44:41 +01:00
Frédéric FRANCE
9b731753e7 Update /compta/salaries/index.php 2014-11-23 17:44:37 +01:00
Frédéric FRANCE
fa89e310ae Update /compta/paiement/list.php 2014-11-23 17:44:33 +01:00
Frédéric FRANCE
dd1c39b44e Update /compta/bank/search.php 2014-11-23 17:44:29 +01:00
Frédéric FRANCE
2a79c2c826 Update /compta/sociales/index.php 2014-11-23 17:44:25 +01:00
Frédéric FRANCE
59494db8c1 Update /compta/tva/reglement.php 2014-11-23 17:44:21 +01:00
Frédéric FRANCE
8c839cc2a1 Update /compta/prelevement/list.php 2014-11-23 17:44:16 +01:00
Frédéric FRANCE
68ccb33def Update /compta/deplacement/list.php 2014-11-23 17:44:13 +01:00
Frédéric FRANCE
045c2f9568 Update /compta/dons/list.php 2014-11-23 17:44:08 +01:00
Frédéric FRANCE
64497de4d8 Update /societe/societe.php 2014-11-23 17:44:04 +01:00
Frédéric FRANCE
62876cc022 Update /societe/consumption.php 2014-11-23 17:44:01 +01:00
Frédéric FRANCE
e7f9b9bf1b Update /adherents/list.php 2014-11-23 17:43:57 +01:00
Frédéric FRANCE
f6db1d5da2 Update /fourn/list.php 2014-11-23 17:43:52 +01:00
Frédéric FRANCE
d57344a2e7 Update /contrat/list.php 2014-11-23 17:43:48 +01:00
Frédéric FRANCE
c97e95f6ab Update /contrat/services.php 2014-11-23 17:43:44 +01:00
Frédéric FRANCE
84d3bd2b43 Update /expedition/list.php 2014-11-23 17:43:40 +01:00
Frédéric FRANCE
b396ccaf73 Update /fichinter/list.php 2014-11-23 17:43:36 +01:00
Frédéric FRANCE
e6da4a2518 Update /comm/list.php 2014-11-23 17:43:32 +01:00
Frédéric FRANCE
baaadd772e Update /holiday/index.php 2014-11-23 17:43:28 +01:00
Frédéric FRANCE
28e620a7bf Update /cron/list.php 2014-11-23 17:43:24 +01:00
Frédéric FRANCE
d17b5268fa (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
2014-11-23 17:43:19 +01:00
Frédéric FRANCE
486d24b8db Fix Typo 2014-11-23 17:43:06 +01:00
Frédéric FRANCE
326e009cad Fix Typo 2014-11-23 17:42:06 +01:00
Laurent Destailleur
652b0f84a7 Fixed: Field is used only by module accounting so must have a condition
on it.
2014-11-23 17:03:22 +01:00
Marcos García de La Fuente
1347a16fd3 Fixed[ bug #1661 ] Bookmarks list "Target" translation missing 2014-11-23 16:55:40 +01:00
Marcos García de La Fuente
a927a04421 Fixed [ bug #1705 ] Members statistics menu entry strange target 2014-11-23 16:55:32 +01:00
Marcos García de La Fuente
5578bc6f5d Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts 2014-11-23 16:55:12 +01:00
Laurent Destailleur
375d9aa336 Merge pull request #2077 from marcosgdf/3.6
Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
2014-11-23 16:53:07 +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
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
eb569fe235 Fixed [ bug #1712 ] Unable to add a social charge 2014-11-23 16:43:52 +01:00
Marcos García de La Fuente
dcfaeb6606 Merge remote-tracking branch 'upstream/3.6' into 3.6 2014-11-23 16:04:23 +01:00
Marcos García de La Fuente
7a272afd12 Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state 2014-11-23 16:03:49 +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
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
671243e8f6 Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +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
e8b2206629 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:57:33 +01:00
Laurent Destailleur
86a3a4f618 Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680
Conflicts:
	htdocs/comm/propal/list.php
2014-11-22 15:57:06 +01:00
Laurent Destailleur
e6e5cb471d Merge pull request #2040 from aspangaro/1681
#1681 Clear sort filter works partially in customers list
2014-11-22 15:54:57 +01:00
Laurent Destailleur
432b623dac Merge pull request #2041 from aspangaro/1684
#1684 Clear sort filter works partially in interventions list
2014-11-22 15:54:38 +01:00
Laurent Destailleur
34306359a4 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:54:14 +01:00
Laurent Destailleur
9ddb76ca12 Merge pull request #2042 from frederic34/patch-9
#1664 Can't sort by mobile phones in contact list
2014-11-22 15:53:55 +01:00
Laurent Destailleur
d3e216c19a Clear compatible with all browsers 2014-11-22 15:53:37 +01:00
Laurent Destailleur
0e44e05600 Merge pull request #2043 from frederic34/patch-2
#1665 Can't clear sort filter on contacts list
2014-11-22 15:52:36 +01:00
Laurent Destailleur
d7b0aab71a Clear works with all browsers 2014-11-22 15:52:08 +01:00
Laurent Destailleur
a7df54ef0d Merge pull request #2044 from frederic34/patch-3
#1666 Clear sort filter works partially in product/services
2014-11-22 15:51:07 +01:00
Laurent Destailleur
6c7bab8d8c Merge pull request #2045 from frederic34/patch-4
#1682 Date is missing in proposals list
2014-11-22 15:50:50 +01:00
Laurent Destailleur
86f2f191ea Merge pull request #2046 from frederic34/patch-5
#1683 Can't clear sort filter on proposals list
2014-11-22 15:50:37 +01:00
Laurent Destailleur
e4804f99ff Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-22 15:50:16 +01:00
Laurent Destailleur
830d470c33 Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-22 15:48:28 +01:00
Laurent Destailleur
d6cb29a17b Merge pull request #2048 from frederic34/patch-7
#1689 Can't sort supplier invoice payments on amounts
2014-11-22 15:47:55 +01:00
Laurent Destailleur
8c440dea4a Fxied: Syntax error 2014-11-22 15:47:14 +01:00
Laurent Destailleur
a6867fef0f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:46:07 +01:00
Laurent Destailleur
b9cf6ddd65 Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698
Conflicts:
	htdocs/langs/en_US/donations.lang
2014-11-22 15:44:59 +01:00
Laurent Destailleur
dfae42cd4a Merge pull request #2051 from aspangaro/1690
#1672 VAT accounts by default are lost in migration
2014-11-22 15:41:58 +01:00
Laurent Destailleur
7fbeb2cbcb Merge pull request #2053 from aspangaro/1688
#1688 The ref filter searches on rowid not on ref in unpaid supplier inv...
2014-11-22 15:41:39 +01:00
BENKE Charles
730bf1c25c Update html.formcontract.class.php
bad filtering on contract list (same sql rule as project)
2014-11-22 15:41:18 +01:00
Laurent Destailleur
a47c7f02e2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:37:34 +01:00
Laurent Destailleur
eaa4b6cb56 Add PR manually because of conflict "#1678 & #1677 Untranslatable token" 2014-11-22 15:37:18 +01:00
Laurent Destailleur
f0d32e3b65 Merge pull request #2059 from aspangaro/1657
#1657 Intervention preview date is not displayed
2014-11-22 15:33:49 +01:00
Laurent Destailleur
135e58871e Merge pull request #2061 from aspangaro/1704
#1704 Untranslatable token in externalsite module admin
2014-11-22 15:33:18 +01:00
Laurent Destailleur
4b2e0b555a Merge pull request #2062 from aspangaro/1706
#1706 Missing table cell in shipment list header + Search fields doesn't...
2014-11-22 15:31:41 +01:00
Laurent Destailleur
088dd1d2e9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:30:37 +01:00
Laurent Destailleur
b5e64b66c8 Merge pull request #2025 from GPCsolutions/dbupgrade
Work around tms bugs with MariaDB
2014-11-22 15:26:42 +01:00
Laurent Destailleur
43f3e28fd6 Fixed: [ bug #1645 ] Can't list contracts 2014-11-22 15:12:36 +01:00
Laurent Destailleur
d6f47227fe Fixed: [ bug #1646 ] Can't list unpaid invoices 2014-11-22 15:09:54 +01:00
Laurent Destailleur
a2d4046f50 Fixed: Untranslatable tokens 2014-11-22 00:45:04 +01:00
Laurent Destailleur
068c7fdb2d Fixed: [ bug #1635 ] le tiers n'apparait plus sur la fiche tache 2014-11-22 00:31:19 +01:00
Laurent Destailleur
95d7dc4841 Fixed: [ bug #1565 ] Customer order label for status 2 is not coherent
in french
2014-11-22 00:08:06 +01:00
Laurent Destailleur
5acdce0b9f Fixed: [ bug #1647 ] Can't list tax payments 2014-11-21 23:52:12 +01:00
Laurent Destailleur
6bc3dd67a8 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-21 23:47:24 +01:00
Laurent Destailleur
ce98036725 Fixed: [ bug #1648 ] Can't see turnover report by product/services 2014-11-21 23:45:56 +01:00
Laurent Destailleur
dba27f4a39 Merge pull request #2057 from frederic34/patch-10
#1650 Can't display supplier products in it's card
2014-11-21 23:40:38 +01:00
Laurent Destailleur
32f4db259c Fix: [ bug #1651 ] Can't display margins in thirdparty card 2014-11-21 23:39:02 +01:00
Laurent Destailleur
b644075faa Fix: doxygen 2014-11-20 23:41:58 +01:00
Laurent Destailleur
f7a74a9ac9 Fix: CRLF 2014-11-20 16:16:15 +01:00
Laurent Destailleur
8bf402593a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-20 15:39:50 +01:00
Laurent Destailleur
95de38e102 Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les
autres module pour affectation but it is a too important change.
2014-11-20 15:32:10 +01:00
Laurent Destailleur
0f5203b384 Edit vat 2014-11-20 15:08:13 +01:00
Laurent Destailleur
8ffae31175 Merge pull request #2055 from frederic34/patch-8
#1695 SQL error on task creation
2014-11-20 14:47:45 +01:00
Laurent Destailleur
d462facf6d Fixed: [ bug #1653 ] Can't access task notes 2014-11-20 14:44:49 +01:00
Laurent Destailleur
ea02bdf85e Fix: duplicate function 2014-11-20 13:06:05 +01:00
Laurent Destailleur
76b8ff9416 Fix: css 2014-11-20 11:34:43 +01:00
Laurent Destailleur
2264009247 Fix: css 2014-11-20 11:24:06 +01:00
Laurent Destailleur
9f6a6d1300 Fix: Missing translation 2014-11-20 10:55:38 +01:00
Laurent Destailleur
c8cd36f3e6 Fixed: ref supplier was visible with label Ref customer. 2014-11-20 10:48:55 +01:00
Laurent Destailleur
d94d7f683b Try to solve warning. 2014-11-20 10:31:59 +01:00
Laurent Destailleur
358ddb0abc Fix: W3C. form into table is forbidden. This makes some browsers crazy. 2014-11-20 10:15:24 +01:00
aspangaro
4b229dabfd #1706 Missing table cell in shipment list header + Search fields doesn't work 2014-11-20 06:55:38 +01:00
aspangaro
01a5f22f4a #1704 Untranslatable token in externalsite module admin 2014-11-20 06:34:50 +01:00
aspangaro
0ec30ea8c0 Merge remote-tracking branch 'Upstream/3.7' into 1657 2014-11-20 06:03:50 +01:00
aspangaro
4d48205e45 #1657 Intervention preview date is not displayed 2014-11-20 06:01:08 +01:00
Laurent Destailleur
179834c663 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-19 23:10:49 +01:00
Laurent Destailleur
f7206c2a52 Fixed: [ bug #1578 ] Cannot create proposal by copy of another one 2014-11-19 23:10:30 +01:00
BENKE Charles
fdac53bfca Update objectline_create.tpl.php
add label tags for product mode type
2014-11-19 18:53:33 +01:00
Christophe Battarel
7d8cf99d58 FIX: bad margin and buy_price calculation when total_ht = 0 (discount
100%) on a line
2014-11-19 18:19:27 +01:00
Frédéric FRANCE
93ed5875d3 #1650 Can't display supplier products in it's card
I think error is in sql request for last supplier invoice list because there is no sql request in supplier products
To avoid error in mysql strict mode
sql-mode="STRICT_ALL_TABLES,ONLY_FULL_GROUP_BY,NO_ZERO_DATE"
2014-11-19 15:50:18 +01:00
Juanjo Menent
9e28452379 Fix: remove duplicate code 2014-11-19 10:02:01 +01:00
Juanjo Menent
3dacdf4e4a Fix: Conflicts and remove duplicate code 2014-11-19 09:41:21 +01:00
Laurent Destailleur
84729a6aa3 Fix: Bad vars 2014-11-18 23:18:59 +01:00
Frédéric FRANCE
3dea1fd68f #1695 SQL error on task creation 2014-11-18 22:53:39 +01:00
aspangaro
e3edc3f690 #1688 The ref filter searches on rowid not on ref in unpaid supplier invoices list 2014-11-18 21:55:41 +01:00
aspangaro
621f2b5c77 #1672 VAT accounts by default are lost in migration 2014-11-18 21:28:12 +01:00
aspangaro
1b077950cd #1698 Untranslatable strings in donation module admin 2014-11-18 19:54:48 +01:00
Laurent Destailleur
8b0a9d78bb Fix: CRLF 2014-11-18 19:03:02 +01:00