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
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
73da011461
FIX #3997 Wrong permission key used for Margins > Read all
2015-11-16 13:16:54 +01:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +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
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
Laurent Destailleur
d18770c1e7
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-12-26 04:16:08 +01:00
Marcos García de La Fuente
416f13c708
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
2014-12-23 16:00:04 +01:00
Laurent Destailleur
ef5035b349
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/liste.php
2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
Laurent Destailleur
615456382d
Merge pull request #2157 from altatof/fix_margin_jalon
...
FIX: avoid milestones in margin calculation
2014-12-18 10:01:11 +01:00
Christophe Battarel
a4a1a991b8
FIX: avoid milestones in margin calculation
2014-12-15 14:13:57 +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
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
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
5c9edcd6a3
Fix: No double title on margin tabs
2014-06-29 14:04:51 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
95793a5475
Fix: fields into group by of sql requests for module margins must be
...
same than fields into select.
2014-03-30 16:08:30 +02:00
Juanjo Menent
638e90eb67
Fix: Margin tabs bad data show
2014-03-28 18:23:28 +01:00
Juanjo Menent
acb752c5f2
Fix: Margin tabs bad data show
2014-03-28 18:22:44 +01:00
Laurent Destailleur
63bb09fbdf
Fix: Removed duplicate translation
2014-03-20 00:21:52 +01:00
Laurent Destailleur
be97066a74
Fix: Bug into sql request because of incomplete group by
2014-03-10 23:57:19 +01:00
Laurent Destailleur
b081083a1a
Fix: Bad management of date.
...
Fix: Submit button was not visible making not possible to filter on
date.
Fix: Use standard css style instead of hardcoded css.
2014-02-16 17:07:17 +01:00
Laurent Destailleur
469dd03673
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Christophe Battarel
ba0273ccc4
fix bad rounding on margin calculation and display
2013-10-30 18:17:37 +01:00
Laurent Destailleur
141258f514
Merge remote-tracking branch 'origin/3.4' into develop
...
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT
Conflicts:
htdocs/fourn/product/liste.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2013-10-07 16:17:51 +02:00
Christophe Battarel
37e47272c7
fix bugs on margin reports
2013-10-05 10:21:38 +02:00
Christophe Battarel
24b28d65e4
fix margin reports bugs (wrong group by + jquery syntax error)
...
Conflicts:
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
2013-08-23 10:57:29 +02:00
Christophe Battarel
edf7af444c
fix margin reports bugs (wrong group by + jquery syntax error)
2013-08-23 09:10:15 +02:00
Cédric Salvador
b04e90c75d
added fields to group-by statements so it stops raising errors in strict mode
2013-07-23 15:05:35 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
8a82c8c5d5
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/margin/agentMargins.php
htdocs/margin/tabs/productMargins.php
2013-05-07 13:08:30 +02:00
fhenry
4a1eb1a588
Fix margin calculation
2013-05-03 15:26:20 +02:00
fhenry
a35a44b23e
Fix margin calculation problem
2013-05-03 15:22:41 +02:00
fhenry
9038549d0d
fix margin calculation problem
2013-05-03 11:50:13 +02:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
8a6adb8a49
Merge pull request #756 from cbattarel/3.3
...
various fixes on margin :
2013-03-18 06:25:54 -07:00
Christophe Battarel
f8291a9efe
use ifsql function
2013-03-18 14:18:17 +01:00
Christophe Battarel
e59084cafc
various fixes on margin :
...
- fix on sortorder
- fix for credit notes
- fix for total
2013-03-18 13:04:08 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
c3e3595d9c
Look: Uniformize style
2012-12-08 17:42:08 +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
