Commit Graph

1307 Commits

Author SHA1 Message Date
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation
invoice
2016-03-12 20:49:38 +01:00
Laurent Destailleur
21c7aacddb Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to
provide backward compatibility with old behaviour.
2016-02-29 10:29:32 +01:00
Laurent Destailleur
5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
7567336680 FIX #4683 2016-02-26 10:51:06 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179 Fix bad transaction level due to code of situation invoices
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2016-01-31 20:44:09 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
fec5f4e20b Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172 Fix init of situation_percent 2015-12-21 12:37:58 +01:00
Laurent Destailleur
ba9796a438 Merge pull request #4082 from atm-maxime/fix_situation_percent
Fix : situation percent should be 100 by default
2015-12-19 17:49:04 +01:00
Laurent Destailleur
98cd4f8307 Fix message so it is more clear what the feature can do or not.
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
Laurent Destailleur
939a36428c Merge pull request #4156 from grandoc/develop
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Laurent Destailleur
a7d03af4af Fix sending emails from mergepedtool was just doing wrong things. 2015-12-03 12:47:21 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on
result of a select.
2015-12-02 22:00:39 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Maxime Kohlhaas
da51a28766 Fix : situation percent should be 100 by default 2015-11-23 17:22:29 +01:00
Frédéric FRANCE
3d05b53a62 Typo 2015-11-22 19:08:38 +01:00
Laurent Destailleur
5e0b5cb75d Merge pull request #4009 from frederic34/patch-7
Update list.php
2015-11-21 00:18:29 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/theme/md/style.css.php
2015-11-20 23:47:07 +01:00
Frédéric FRANCE
c647ad6425 Update list.php 2015-11-18 18:15:02 +01:00
Laurent Destailleur
fbd1d2360f Comment 2015-11-18 13:42:38 +01:00
Frédéric FRANCE
0424a2bb3d Update list.php 2015-11-16 16:27:37 +01:00
Laurent Destailleur
388748055a Fix missing translation for VAT 2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
74a4006a84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Florian HENRY
019575d9ed FIX : better fix for #3805 2015-11-12 13:21:35 +01:00
philippe grand
c712532bf6 [Qual] Uniformize code 2015-11-12 11:59:15 +01:00
Laurent Destailleur
3906cb79c5 NEW: Add parameter to add a link to use "date of invoice" in one click
when fille a payment card.
2015-11-07 23:46:07 +01:00
Sergio Sanchis Climent
6b01db5960 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee Maintain origin_id and origin for copy document
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00