Laurent Destailleur
cfec85c2d6
Fix: Rewrite content of getMarginInfos.
...
This solve bug of rounding with total price when we need a unit price.
This solve lso bug of rounding on non decimal basis that we don't want.
Also this remove calling database when not usefull so make possible to
call this function into fetch (this remove the FIXME not into comment
so).
2013-12-16 13:24:00 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Laurent Destailleur
3c87e1e20d
Fix: no required class for not mandatory fields
2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
bba2892752
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/commande/liste.php
2013-12-15 02:02:24 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
0e25939373
Fix: price function not correctly used
2013-12-14 17:40:23 +01:00
Laurent Destailleur
db9ef992eb
Fix: Clean var
2013-12-14 17:25:57 +01:00
Laurent Destailleur
648bf73bac
Fix: [ bug #1179 ] Wrong warnings on commande/liste.php / delivery date
...
should be checked
Conflicts:
htdocs/commande/liste.php
2013-12-14 15:49:08 +01:00
Laurent Destailleur
ed40e6d9b0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/langs/en_US/bills.lang
2013-12-14 15:44:10 +01:00
Laurent Destailleur
dc1ccbfae8
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:35:13 +01:00
Laurent Destailleur
8cd538cce4
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 15:26:58 +01:00
Laurent Destailleur
7ecb313798
Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers
2013-12-14 15:26:22 +01:00
Laurent Destailleur
6cc20cb731
Fix: Filter on third parties were wrong for external users.
2013-12-14 15:21:15 +01:00
Laurent Destailleur
5a4b5dcc26
Fix: Missing condition
2013-12-14 14:21:27 +01:00
Laurent Destailleur
ad0d79a831
Merge pull request #1346 from marcosgdf/translation
...
Corrected translation
2013-12-13 18:51:04 -08:00
Laurent Destailleur
684be44846
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 02:57:43 +01:00
Laurent Destailleur
4d84fc46a4
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/makepack-dolibarr.pl
2013-12-14 02:56:23 +01:00
Laurent Destailleur
1f3f6cc7b8
Fix: Avoid to have external package into standard distribution
2013-12-14 02:55:12 +01:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
b83f664ced
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 01:29:24 +01:00
Laurent Destailleur
88aa0ad4da
Fix: Doxygen problems
2013-12-14 01:28:59 +01:00
Laurent Destailleur
5cd6c05384
Fix: Uniformize amounts
2013-12-14 00:31:29 +01:00
Laurent Destailleur
c51fa7048c
Fix: text must not be encoded when provided as data of a function.
2013-12-13 21:12:18 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
Laurent Destailleur
75703a03cc
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-10 21:48:22 +01:00
Laurent Destailleur
f0eb98c27a
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93
Fix: We should not load stock details at each product fetch
2013-12-10 19:41:45 +01:00
Laurent Destailleur
ad420bbf42
Mark file as bugged (seriously)
2013-12-10 18:56:02 +01:00
Laurent Destailleur
aa4ae60826
Fix: sql where on an int must not contains '
2013-12-10 18:54:44 +01:00
Laurent Destailleur
ce3047203f
Fix: Missing db transaction
2013-12-10 18:54:07 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Marcos García de La Fuente
d226abcdfc
Corrected translation
2013-12-10 14:30:40 +01:00
Laurent Destailleur
a89a4ee81a
Fix: Delete vat entry when bank line was already deleted.
2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48
Fix: fields too large
2013-12-09 11:00:36 +01:00
Laurent Destailleur
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +01:00
Laurent Destailleur
705192215a
Merge pull request #1341 from marcosgdf/bug-1182
...
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 16:49:50 -08:00
Laurent Destailleur
565fb615bc
Update gitignore
2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24
Fix: Missing translation
2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01:00
Laurent Destailleur
7aa2c9dcd1
Fix: Error management with corrupted module files
2013-12-08 02:33:32 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
d8cd7571ec
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b
Update ignore files
2013-12-07 18:47:58 +01:00
