Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
e4645cf2c5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/blockedlog/class/blockedlog.class.php
htdocs/contrat/card.php
htdocs/societe/card.php
2017-10-27 02:12:35 +02:00
Laurent Destailleur
82231b77a2
Fix data for supplier must be not visible if supplier module off
2017-10-27 01:46:54 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
e72f0076ed
Remove border-bottom useless
2017-03-23 13:06:38 +01:00
Laurent Destailleur
17c1b3f1d2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-10-29 18:44:55 +02:00
gauthier
a814e02d53
FIX : margin tab on customer card must filter on current entity invoices
2016-10-21 12:40:19 +02:00
Laurent Destailleur
a4c3a4588d
FIX link "back to list" was not visible.
2016-09-18 14:12:49 +02:00
aspangaro
dd2e43754e
Uniformize presentation in Thirdparty
2016-08-02 06:02:01 +02:00
Laurent Destailleur
a87c2f9579
Fix several fixes on margin reports
2016-07-30 18:57:26 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
2d3915b88c
Fix hook implementation on some thirdparty pages
2015-12-23 14:31:42 +01:00
Laurent Destailleur
e2e804e37a
Minor fix
2015-11-13 00:30:10 +01:00
Laurent Destailleur
c0872d690e
Use new banner for other tabs of product
2015-11-07 13:32:14 +01:00
Laurent Destailleur
e76124add5
FIX #3606
2015-10-01 16:09:51 +02:00
Laurent Destailleur
fff86c0769
Fix PHPCS
2015-07-28 18:33:43 +02:00
Laurent Destailleur
6952f33309
Restore data into bannner of thirdparty to have content matching other
...
tabs.
2015-02-20 23:29:55 +01:00
Marcos García de La Fuente
529d4447ef
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
2015-02-17 00:04:31 +01:00
Laurent Destailleur
c0afd4f174
Fixed: [ bug #1654 ] Can't display margins in product card
2014-12-14 15:44:22 +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
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +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
847fa3827b
Fix: use wrong css
2014-05-11 17:56:29 +02:00
Laurent Destailleur
be97066a74
Fix: Bug into sql request because of incomplete group by
2014-03-10 23:57:19 +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
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
fhenry
d8f1818f86
Fix margin calculation problem, and add myuser_fullname and myuser_logo
...
into standard ODT replacement
2013-05-03 15:44:35 +02:00
fhenry
4a1eb1a588
Fix margin calculation
2013-05-03 15:26:20 +02:00
fhenry
9038549d0d
fix margin calculation problem
2013-05-03 11:50:13 +02:00
fhenry
8cfbcd47ca
Fix margin calculation
2013-05-03 11:26:00 +02:00
fhenry
97192510e2
Fix bug on margin calculation (column price no more use) use subprice
...
instead.
2013-05-03 11:09:58 +02:00
fhenry
0dbc73a6cc
Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d
2013-05-02 22:57:42 +02:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +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
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
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
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
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
