Commit Graph

1401 Commits

Author SHA1 Message Date
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
2015-11-05 02:45:15 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +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
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00
Maxime Kohlhaas
9e9f32e3bf FIX : project was not retrieved on invoice creation form 2015-10-19 15:38:28 +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
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Gauthier
b3e3cc14a7 FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test.
2/ Reindented code
2015-10-15 17:26:16 +02:00
Laurent Destailleur
a1d37f92cb Several fix in CSS 2015-10-09 20:00:43 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Laurent Destailleur
00911d1afe Fix bad param 2015-10-03 19:05:13 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Juanjo Menent
d503dd928b Merge pull request #3597 from GPCsolutions/displaymargin
[Qual] Replaced deprecated displayMarginInfos()
2015-09-26 08:47:55 +02:00
Raphaël Doursenaud
50edf63448 [Qual] Replaced deprecated displayMarginInfos() 2015-09-24 21:05:58 +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
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
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
8699776930 Better usability with dolidroid 2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09 Fix javascript error 2015-09-18 16:05:38 +02:00
Laurent Destailleur
0ef297582b Merge pull request #3511 from marcosgdf/bug-3423
FIX #3423 Not possible update values of extrafields in Facture
2015-09-13 19:07:15 +02:00
Juanjo Menent
3db03ed558 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 23:45:16 +02:00
Juanjo Menent
1deb77896f Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order 2015-09-12 23:42:48 +02:00
Marcos García de La Fuente
637855485e FIX #3423 Not possible update values of extrafields in Facture
Close #3423
2015-09-12 17:28:32 +02:00
Laurent Destailleur
615734012e Merge pull request #3476 from marcosgdf/refactor
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +02:00
Marcos García de La Fuente
9ce8024f1e Merge remote-tracking branch 'upstream/develop' into refactor 2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
3c5159f497 Created Facture::hasDelay function 2015-09-05 10:56:13 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
2d5331b8f8 FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice
Close #3460
2015-09-03 12:13:03 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Laurent Destailleur
dfde0314c6 Fix bad permission 2015-08-31 12:34:59 +02:00
Marcos García
e4bddb4a00 NEW Added __PROJECT_NAME__ tag for customer invoice emails 2015-08-30 13:47:02 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Maxime Kohlhaas
9f9ba12802 New : option to allow credit note without related invoice 2015-07-08 14:32:57 +02:00
Maxime Kohlhaas
dc0a1b7fd5 New : add shortcut to create a credit note from the concerned bill 2015-07-08 14:01:30 +02:00
aspangaro
54d2a96d8e dir DOL_URL_ROOT 2015-07-05 05:56:45 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template.
Uniformize look.
2015-07-04 03:28:52 +02:00
Laurent Destailleur
bdba8f1f38 Fix courrent outstanding amount not visible 2015-06-23 23:33:25 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00