Laurent Destailleur
07b9a9b44d
Better US english
2018-04-28 13:08:09 +02:00
Laurent Destailleur
bf1e3705fb
Fix english
2018-04-11 12:47:10 +02:00
Laurent Destailleur
6ca40bcbd4
Fix translation
2018-03-19 11:01:44 +01:00
Laurent Destailleur
9870cafea3
Better translation
2017-05-16 16:40:03 +02:00
Laurent Destailleur
a87c2f9579
Fix several fixes on margin reports
2016-07-30 18:57:26 +02:00
Laurent Destailleur
d0a15d32b2
Clean language files
2016-06-18 19:48:58 +02:00
Laurent Destailleur
4382f2a437
Clean language files
2016-06-18 11:06:11 +02:00
Laurent Destailleur
27cf494009
Fix bad translation
2016-03-30 23:35:43 +02:00
Laurent Destailleur
d396612a7c
NEW: Add a new method for margin calculation. Added margin on "cost
...
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
Laurent Destailleur
e26940ddf7
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
1a0179dd1f
More complete help
2015-11-02 11:08:36 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Laurent Destailleur
72cabe2fc3
More complete description of margin rules calculation
2015-10-06 19:27:48 +02:00
Laurent Destailleur
9e39c73f5f
Better translation
2015-07-16 13:28:40 +02:00
Marcos García de La Fuente
c667f8734a
[ task #1793 ] Create new permission to restrict commercial agent margin to logged user
2015-01-18 16:42:11 +01:00
Christophe Battarel
44882f4035
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-05 17:03:53 +01:00
Laurent Destailleur
2b08417b77
Fix: [ bug #1612 ] Adding free product line line with negative qty in
...
credit notes, doesn't give error message
2014-10-27 01:51:33 +01:00
Raphaël Doursenaud
e07e86b824
Deduplicated lines of the reference language files
...
Used the new deduplicatefilelinesrecursively.sh script
2014-03-27 12:04:03 +01:00
Laurent Destailleur
63bb09fbdf
Fix: Removed duplicate translation
2014-03-20 00:21:52 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Christophe Battarel
89a5638908
Fix bad translation on margin config
2013-11-17 12:59:33 +01:00
Laurent Destailleur
086eb125bf
Qual: Removed no more required translation entry UTF8
2013-10-23 10:34:48 +02:00
Laurent Destailleur
d8cef10ea3
Make comment generic for all files
2013-05-27 10:38:50 +02:00
Marcos García
a37392e34e
Removed conflict with margins module name and description (already set in admin.lang)
2013-05-12 12:19:26 +02:00
Marcos García
6252857440
Fixed translations and BILL_SUPPLIER_BUILDDOC trigger
2013-04-06 17:56:10 +02:00
simnandez
d8651ca830
Trad: Add missing margins translations
2012-12-01 15:47:28 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
simnandez
dda12c3d70
Trad: Add missing margins translations
2012-11-30 17:58:12 +01:00
Christophe Battarel
951b98a963
add option to select contact type associated to commercial agents for margin and commission modules
2012-09-18 09:44:34 +02:00
Christophe Battarel
37b166024d
add en_US language files for commissions and margins modules
2012-09-11 15:20:00 +02:00
