lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,848 Commits 43 Branches 150 Tags 886 MiB
f8b0e535fa
Commit Graph

211 Commits

Author SHA1 Message Date
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
7dd06a1ae6 Fix margin pagination 2016-12-27 02:01:27 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
03b882d095 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-29 19:12:58 +02: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
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +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
b2307f9b90 Uniformize code 2016-09-28 21:08:25 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
a4c3a4588d FIX link "back to list" was not visible. 2016-09-18 14:12:49 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
6b6ee8795c Button filter on boxes is at end of title line 2016-08-11 19:55:29 +02:00
aspangaro
a1d1396919 Uniformize presentation 2016-08-10 07:40:40 +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
629271cf85 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:23:07 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00
Marcos García de La Fuente
863efcbc5d NEW Removed unused FormOrder::selectSourcesCommande function 
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
 2016-04-16 21:33:23 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Laurent Destailleur
be483bd787 FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
Laurent Destailleur
8a1358d539 FIX Some records were lost into margin per product report 2016-04-01 12:27:49 +02:00
Laurent Destailleur
27cf494009 Fix bad translation 2016-03-30 23:35:43 +02:00
Christophe Battarel
b8f3264f60 FIX: dont retrieve new buying price on margin display 2016-03-29 11:37:35 +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
Florian HENRY
1306a606a8 NEW : Margins module - Check/update buying price on invoice lines 2016-02-09 20:01:43 +01: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
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
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +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
Laurent Destailleur
e2e804e37a Minor fix 2015-11-13 00:30:10 +01:00
Laurent Destailleur
57e162d7f8 The component selectAjaxArray can return javascript part into a global 
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
 2015-11-07 15:46:06 +01:00
Laurent Destailleur
c0872d690e Use new banner for other tabs of product 2015-11-07 13:32:14 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +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
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
72cabe2fc3 More complete description of margin rules calculation 2015-10-06 19:27:48 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
e76124add5 FIX #3606 2015-10-01 16:09:51 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +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
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
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
847fa3827b Fix: use wrong css 2014-05-11 17:56:29 +02:00