Laurent Destailleur
2d3915b88c
Fix hook implementation on some thirdparty pages
2015-12-23 14:31:42 +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
fmarcet
440df980ea
Fix SQL Query
2015-10-29 13:43:07 +01:00
fmarcet
dba952e596
Fix: Products image on getNomUrl
2015-10-29 12:51:25 +01:00
Laurent Destailleur
72cabe2fc3
More complete description of margin rules calculation
2015-10-06 19:27:48 +02:00
Laurent Destailleur
e76124add5
FIX #3606
2015-10-01 16:09:51 +02:00
Laurent Destailleur
19ac160696
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/index.php
2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-03 10:41:44 +02:00
fmarcet
2b6a481011
FIX: The hours of date filter aren't correct
2015-09-01 09:46:45 +02:00
Laurent Destailleur
fff86c0769
Fix PHPCS
2015-07-28 18:33:43 +02:00
Sof
e455ed14ef
FIX : Move "<script>" code inside "body"
2015-07-24 11:27:40 +02:00
Laurent Destailleur
9e39c73f5f
Better translation
2015-07-16 13:28:40 +02:00
Laurent Destailleur
1485ead215
Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate
...
option to get same behaviour.
2015-06-24 21:36:28 +02:00
jfefe
7e0357dcf9
FIX : remove deprecated property 'libelle' on product object
2015-05-04 03:03:24 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
Marcos García de La Fuente
831177ef99
Implemented constants for Product class
2015-03-30 03:14:07 +02:00
Marcos García de La Fuente
e3853a648f
Redundant code
2015-02-25 19:44:12 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01: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
770ddb6b0f
Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-task-1793
Conflicts:
ChangeLog
htdocs/margin/lib/margins.lib.php
2015-01-31 14:29:15 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01: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
08214999a7
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-01-18 15:21:38 +01:00
Marcos García de La Fuente
7e16d0c1d3
Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
2015-01-13 01:48:58 +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
c0afd4f174
Fixed: [ bug #1654 ] Can't display margins in product card
2014-12-14 15:44:22 +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
Laurent Destailleur
32f4db259c
Fix: [ bug #1651 ] Can't display margins in thirdparty card
2014-11-21 23:39:02 +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
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
frederic34
fada3ca9a2
User must not see invoices if no rights
2014-07-29 16:27:34 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
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/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Drosis Nikos
4f0d01d5c5
Fix Link product, In list view and label product
...
This Fix added and develop.
2014-07-18 14:36:46 +03:00
Laurent Destailleur
3a625ce6bf
Merge pull request #1741 from marcosgdf/url-not-available
...
Removed index.php and replaced them with blank index.html as it is more appropiate
2014-07-14 23:20:32 +02:00
Drosis Nikos
fcc0632beb
In list view and label product
2014-07-14 17:18:31 +03:00
Drosis Nikos
1ae4341d57
Fix Link product
2014-07-14 16:53:12 +03:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +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
