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
b197231c04
fix bad margin calculation for credit notes
2013-09-24 17:49:56 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Christophe Battarel
775d259f88
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 14:52:41 +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
28247f37ae
corrected filter in form_thirdparty call
2013-07-23 15:15:01 +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
Marcos García
4318d5c02d
Missing succes message in margin module config page
2013-05-19 12:19:31 +02:00
Marcos García
5f4433dbff
Missing succes message in margin module config page
2013-05-19 12:09:34 +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
fhenry
0dbc73a6cc
Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d
2013-05-02 22:57:42 +02:00
Marcos García
be5fcfdce3
Improved es_ES translations + replaced lang key in margins module admin page
2013-04-27 12:56:57 +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
Laurent Destailleur
b119ab5539
Prepare 3.3 freeze.
2012-12-08 14:24:57 +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
Laurent Destailleur
078b015db8
Work on multitax (vat). Need your test.
...
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
2012-11-03 16:32:49 +01:00
Laurent Destailleur
4f0e4be449
Merge pull request #402 from cbattarel/develop
...
add option to select contact type associated to commercial agents for margin and commission modules
2012-09-18 01:24:00 -07: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
Laurent Destailleur
cd6a8fa761
New: Uniformize code
2012-09-17 02:07:14 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
Regis Houssin
125f499e82
Fix: dol_htmloutput_events is already call in llxFooter
2012-09-13 16:15:36 +02:00
Laurent Destailleur
c11c3897ef
Qual: Uniformize code
2012-09-12 20:45:01 +02:00
Regis Houssin
282d9c9c29
Merge pull request #372 from cbattarel/develop
...
dont use lines without buying price for margin calculation if ForceBuyPr...
2012-09-06 06:10:51 -07:00
Christophe Battarel
2b010c9ba4
dont use lines without buying price for margin calculation if ForceBuyPriceIfNull is set
2012-09-06 13:49:39 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
37c4898720
Removed "./" in require statements
...
It does not make any sense to do that
2012-08-23 01:43:44 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
FHenry
bf2d0ea82a
correct checkstyle
2012-07-30 20:15:18 +02:00
Marcos García
a0eb690d0f
Fixed untranslated string and broken image
2012-07-30 03:28:16 +02:00
Laurent Destailleur
dce9b96260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/lib/repair.lib.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
fb23364511
Fix: uniformize code
2012-07-23 16:10:54 +02:00
Laurent Destailleur
474a67a4a4
Fix: picto
2012-07-22 16:11:23 +02:00
Laurent Destailleur
0d6baa4288
Qual: Enhance codesniffer setup
2012-07-22 14:08:05 +02:00
Regis Houssin
fafd79a0f8
Fix: uniformize code (in progress)
2012-07-20 09:57:50 +02:00
