Commit Graph

203 Commits

Author SHA1 Message Date
Laurent Destailleur
e4767b1a51 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/fiche-rec.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
2017-09-16 12:11:18 +02:00
Laurent Destailleur
1154f871f1 Update fiche-rec.php 2017-09-04 10:52:49 +02:00
Marcos García
ac7f1035e1 FIX #7325 Default VAT rate when editing template invoices is 0%
Close #7325
2017-09-03 12:25:27 +02:00
Laurent Destailleur
b22817c237 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/fiche-rec.php
2017-05-29 10:25:07 +02:00
arnaud
c9738aa7ea FIX doactions hook missing in invoice model page 2017-05-16 11:34:00 +02:00
Laurent Dinclaux
6cac627117 Add support for localtaxes to predefined invoices 2017-05-09 23:19:16 +11:00
florian HENRY
8f97177dae FIX 6614 2017-04-24 14:44:44 +02:00
Laurent Destailleur
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Marcos García de La Fuente
996b5e9f87 Corrected translation errors and little bug showing a non-available button to a restricted user 2017-04-09 18:17:46 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Marcos García de La Fuente
2448b9ee55 FIX #6619 Template invoices list do not respect restricted thirdparty user rights 2017-03-30 14:52:26 +02:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
florian HENRY
28115689e8 fix : wrong $formproject->select_projects call on model invoice 2017-01-26 08:46:39 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
florian HENRY
e61770671a fix : create project from facture rec and back url wrong 2016-12-10 12:53:58 +01:00
Laurent Destailleur
4b831537e5 Fix several problem in notes management of template invoices. 2016-12-04 21:27:08 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
florian HENRY
9daac25519 Fix translation for CRON 2016-11-10 08:31:08 +01:00
BENKE Charlie
f7294d5c3f Update fiche-rec.php 2016-11-05 11:04:16 +01:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
Laurent Destailleur
d81cd7ebbe NEW Can link template invoice to other objects. Generated invoice will
be linked to same objects.
2016-10-04 11:14:00 +02:00
Sof
23dffa33a6 Fix : email adress 2016-09-26 19:32:31 +02:00
Sof
86a06de015 New : add confirm on invoice deletion
Alternatively reformated all code
2016-09-26 19:29:54 +02:00
Laurent Destailleur
c2f4bc90ab NEW Can sort on status reccurin invoice in list of template invoices. 2016-09-19 16:52:33 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
6b7d509e44 Fix css 2016-08-29 18:12:53 +02:00
Laurent Destailleur
9c1ba67169 Fix css 2016-08-29 16:40:51 +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
f06545a3fe Fix cancel button ignored 2016-08-19 17:22:53 +02:00
Laurent Destailleur
83107746ad Fix no way to fix the ref of recurring invoice when an error was done
into typing.
2016-08-19 16:18:39 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on
orders.
2016-07-25 21:50:41 +02:00
Laurent Destailleur
2c97d0855a Fix: On template invoice, edition of line was not complete. 2016-06-28 17:51:29 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
9c88eadbe4 Fix: button to generate invoice manually must be disabled if we reach
max number of generation.
2016-06-06 11:48:39 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
Laurent Destailleur
aa31a7e9c5 Finished list of template invoices 2016-04-27 20:09:55 +02:00
Laurent Destailleur
7608366e70 Fix pagination 2016-04-27 19:34:38 +02:00
Laurent Destailleur
9987c9b77a Can sort on field of recurring invoices 2016-04-27 17:36:05 +02:00
Laurent Destailleur
bdb7fe8d29 Missing public note on recurring invoices
Can change position of lines in recurring invoices
2016-04-27 11:07:20 +02:00
Laurent Destailleur
78cda5dc07 Fix problem with code of reccuring invoices 2016-04-26 22:00:41 +02:00
Laurent Destailleur
c73f4e5d7b FIX Project was lost when creating invoice from a template
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
Laurent Destailleur
ccdbf69cd5 Bette explanation on how to create an repeatable invoice 2016-04-24 18:11:19 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function"
This reverts commit 87cd6e1e40.
2016-03-25 15:34:37 +01:00