Commit Graph

1155 Commits

Author SHA1 Message Date
Laurent Destailleur
bafc53ad95 Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error 2014-05-11 19:05:51 +02:00
Laurent Destailleur
ebb9016ad5 Fix: missing 'ifone' into param 2014-04-02 19:34:42 +02:00
Laurent Destailleur
918fe5dbb5 Fix: [ bug #1318 ] Problem with enter key when adding an existing
product to a customer invoice
2014-04-02 11:58:59 +02:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
57bd043f59 Fix: Missing lang loading 2014-03-23 20:30:54 +01:00
Laurent Destailleur
4afb85bd1d Fix: Several fix into workflow/condition for invoice payments or convert
into discount.
2014-03-19 22:30:25 +01:00
Florian Henry
3f6b319d41 Fix deposit invoice 2014-03-14 23:42:45 +01:00
Laurent Destailleur
c6fb7996ba Fix: [ bug #1238 ] When creating accompte with a %, free product are
used for calculation.
2014-03-01 19:11:13 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
2014-02-16 23:51:29 +01:00
Laurent Destailleur
3aba53a9ae Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:26:41 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Florian Henry
e971e4dfff Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal 2013-12-23 11:05:14 +01:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
30428ec6e5 Fix: Control on minimum amount must be one only on standard and
replacement invoices.

Conflicts:
	htdocs/compta/facture.php
2013-12-01 19:41:29 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/compta/facture.php
2013-11-21 02:19:21 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder
Conflicts:
	htdocs/compta/facture.php
2013-11-21 02:07:13 +01:00
Raphaël Doursenaud
7945011955 Make AJAX new line form work again
FIXME: Factorize!
2013-11-19 17:54:36 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and
make some browsers crazy.
2013-11-17 23:25:25 +01:00
Laurent Destailleur
8ec50fce23 Move warning at correct place.
Fix: Reset of amount was not working
2013-11-16 14:26:42 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Laurent Destailleur
d0d9cce146 Fix: price should not be used to compare amounts. Price is a formated
string, not an amount.
2013-11-15 22:15:48 +01:00
simnandez
618bf4d75e Remove td 2013-11-15 17:48:19 +01:00
simnandez
0aba9b02b8 Add alert for outstanding bill 2013-11-15 17:43:13 +01:00
Laurent Destailleur
190dabc3f7 Fix: Tons of bugs with extrafields feature. 2013-11-05 13:11:36 +01:00
Laurent Destailleur
315e2e4c13 Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +02:00
BENKE Charles
53531ff847 Update facture.php 2013-10-06 17:23:31 +02:00
BENKE Charles
ca0ba99eff Update facture.php 2013-09-27 22:08:06 +02:00
BENKE Charles
fff1309cec Update facture.php 2013-09-27 22:06:05 +02:00
Laurent Destailleur
5341811ec0 Fix: Clean awful code 2013-09-23 12:31:10 +02:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
Laurent Destailleur
b74f73c885 Fix: Calculation of deposit amount when using a percent was done only on
last line.
2013-09-21 10:53:46 +02:00
Cédric Salvador
0c93c6f0b1 format 2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f indentation 2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34 don't display warehouse selection if there's only one
Conflicts:
	htdocs/compta/facture.php
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang
2013-09-09 09:55:51 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Florian Henry
853758a422 REplicate extrafield value
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e All deposit inoice form order 2013-08-30 10:46:05 +02:00
lalaina rasamoelina
f913422e62 T999-develop: link invoice to a command
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
2013-08-22 10:17:03 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices
more to come : same on edit, user permissions
2013-08-12 15:34:09 +02:00
Laurent Destailleur
23516a466c Fix: Pb with predefined invoices 2013-08-06 23:56:13 +02:00
Laurent Destailleur
acf3db8512 Fix: Pb with predefined invoices 2013-08-06 23:50:12 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
jfefe
bddbc6f6b2 Fix : show input fields if missing required extrafield when editing
invoice
2013-07-26 16:02:48 +02:00
jfefe
371b40cc76 Do not create invoice if required extrafields are empty 2013-07-26 13:22:22 +02:00
Laurent Destailleur
ad783cc4f1 Merge pull request #1112 from PaulPoulain/949-develop
949 Put the ref_client in the subject mail
2013-07-19 06:59:49 -07:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
lalaina rasamoelina
913f4d94cc Put the ref_client in the subject mail 2013-07-18 12:39:50 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9 Prepare code to uniformize method addline. 2013-07-10 16:07:57 +02:00