Commit Graph

3690 Commits

Author SHA1 Message Date
Maxime Kohlhaas
572be23fc1 FIX : filters on supplier invoices list are not used, search_status instead 2015-10-19 15:57:23 +02:00
Laurent Destailleur
9ad998d0be Add comments 2015-10-18 21:51:09 +02:00
Laurent Destailleur
a90c5ce962 Revert "Add currently used sortfields and sortorder"
This reverts commit 0663932589.
2015-10-18 21:48:17 +02:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Juanjo Menent
1f05cb844c Merge pull request #3755 from grandoc/develop
[Qual] Uniformize code
2015-10-18 12:35:17 +02:00
Juanjo Menent
02c1f37a95 Merge pull request #3747 from fappels/develop-best-pmp-pos-margin
Qual getSupplierPrices
2015-10-18 12:10:29 +02:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Laurent Destailleur
3d94e3d80e FIX Editing a supplier price should keep the vat. 2015-10-17 12:01:17 +02:00
Frédéric FRANCE
d68db2a844 Update fournisseur.commande.class.php 2015-10-17 08:48:53 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought
contracts/recurring subscriptions.
2015-10-17 00:52:35 +02:00
fappels
0663932589 Add currently used sortfields and sortorder 2015-10-16 12:51:49 +02: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
fappels
74c373a3af Qual getSupplierPrices
use productfourn method list_product_fournisseur_price because query has
same purpose.
2015-10-15 22:54:42 +02: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
80bd563fde Use GETPOST 2015-10-11 20:41:06 +02:00
Laurent Destailleur
61d739635e Uniformize code and css for tables. Filters must be implemented
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref,
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Laurent Destailleur
f54a1ca367 CSS enhancement 2015-10-06 01:03:31 +02:00
frederic34
1e8ff69267 Optioncss 2015-10-04 13:34:55 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
ed917ab447 Optioncss 2015-10-04 11:30:28 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Juanjo Menent
8f28e7cf1c Merge remote-tracking branch 'upstream/3.8' into 3.8 2015-10-03 23:34:37 +02:00
Juanjo Menent
8febf25c23 Fix: #3566 2015-10-03 23:34:10 +02:00
Juanjo Menent
bc01d28061 Fix: formconfirm printing 2015-10-03 22:59:22 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
2015-09-22 16:28:34 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
e36928fd65 FIX #3529 2015-09-16 21:23:52 +02:00
Florian HENRY
8fd9d2a7ce FIX : #3530 2015-09-16 10:21:32 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00
Laurent Destailleur
db3c544e21 Fix #3240 [Supplier orders] Dashboard links to unuseful page 2015-09-12 18:14:08 +02:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
1966d75ced FIX #3490 2015-09-12 12:50:55 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/fourn/commande/dispatch.php
2015-09-12 11:50:46 +02:00
Laurent Destailleur
36632593c0 Fix SQL injections #3300 2015-09-12 11:36:19 +02:00