Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 00:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,830 Commits 36 Branches 190 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

54 Commits

Author SHA1 Message Date
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
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
Frédéric FRANCE
998649d467 Indentation 2016-01-02 18:51:31 +01:00
philippe grand
fc8c12d6f6 [Qual] Uniformize code 2015-12-10 16:14:37 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +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
310ecb1e09 FIX: Show product image on getNomUrl() 2015-10-29 12:28:28 +01:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Laurent Destailleur
e36928fd65 FIX #3529 2015-09-16 21:23:52 +02:00
Raphaël Doursenaud
cea47f3e25 Added tags/categories management to suppliers 
Suppliers part of #2571
 2015-08-26 19:30:55 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
581b6d0001 Fix: missing status on contacts 2015-07-14 11:51:27 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Marcos García de La Fuente
15b1f03a08 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/list.php
	htdocs/comm/prospect/list.php
	htdocs/societe/consumption.php
	htdocs/societe/soc.php
 2015-04-19 00:48:07 +02:00
Marcos García de La Fuente
401c0584e5 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 14:59:19 +02:00
Juanjo Menent
dc74302985 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 11:32:01 +02:00
Laurent Destailleur
1bbecc0912 Restore link to stock for products. 2015-04-08 19:26:36 +02:00
Marcos García de La Fuente
8b8171c700 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/card.php
 2015-03-30 03:25:57 +02:00
Marcos García de La Fuente
50a3563f03 Minor correction to the product list of a supplier 2015-03-26 10:57:13 +01:00
Laurent Destailleur
221d44a4b8 br at wrong place 2015-03-22 18:54:12 +01:00
Marcos García de La Fuente
70f6c3fdbb NEW: List of recent modified supplier product prices in Supplier card 2015-03-20 12:59:37 +01:00
Laurent Destailleur
79ca1fe147 Clean code. 2015-03-15 23:32:43 +01:00
Marcos García de La Fuente
b822a1e3ad Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-15 18:20:17 +01:00
Laurent Destailleur
2a09e34bdf Uniformize etrafields visibility for thirdparties card 2015-03-14 13:05:28 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks. 
Extrafield index on fk_object must be unique.
 2015-03-13 20:27:54 +01:00
Laurent Destailleur
9b4f65587f Fix option MAIN_HTML_TITLE 2015-03-13 13:27:24 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
2ba795fcbc NEW: [ task #851 ] Add a new field: Commercial name 2015-02-28 14:30:06 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
0f7af613f1 [CORE] ajout du bouton "créer une demande de prix" sur la fiche fournisseur (#new_ask_price). 2015-02-02 10:24:42 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
Laurent Destailleur
da75877caa Merge pull request #2264 from frederic34/patch-2 
Use getNomUrl on every list to uniformize display
 2015-01-21 00:03:21 +01:00
Frédéric FRANCE
1fc9517200 Use css badge 2015-01-19 19:18:57 +01:00
Frédéric FRANCE
e82301e001 Update card.php 2015-01-19 19:07:34 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +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
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +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
Frédéric FRANCE
93ed5875d3 #1650 Can't display supplier products in it's card 
I think error is in sql request for last supplier invoice list because there is no sql request in supplier products
To avoid error in mysql strict mode
sql-mode="STRICT_ALL_TABLES,ONLY_FULL_GROUP_BY,NO_ZERO_DATE"
 2014-11-19 15:50:18 +01:00
Laurent Destailleur
81e203eef1 Fix: Ref was not visible. 2014-11-15 20:48:39 +01:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Laurent Destailleur
ba33f73767 Merge pull request #1925 from tiaris/develop 
adding hooks for supplier card and order card
 2014-09-29 15:40:31 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00