Commit Graph

1094 Commits

Author SHA1 Message Date
Laurent Destailleur
b8d5d6a383 Fix bad placeholder 2016-05-26 19:38:52 +02:00
Laurent Destailleur
75b4c61fbc Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/contrat/card.php
2016-05-17 00:02:54 +02:00
Laurent Destailleur
1bba8166f8 FIX #5207 2016-05-13 23:12:53 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
b94295e4ca Merge pull request #5102 from atm-alexis/3.8
FIX search on date into supplier invoice list
2016-04-29 18:45:04 +02:00
Laurent Destailleur
b0977e3e2a Merge pull request #5122 from fmarcet/3.8
FIX: Not filtering correctly when come from dashboard
2016-04-29 17:40:03 +02:00
Laurent Destailleur
8a4871323d Merge pull request #5022 from marcosgdf/bug-5008
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
2016-04-29 17:01:01 +02:00
fmarcet
e96e0f637a FIX: Not filtering correctly when come from dashboard 2016-04-28 10:41:37 +02:00
fmarcet
d599261d20 FIX: Not filtering correctly when come from dashboard 2016-04-28 10:38:50 +02:00
Alexis Algoud
1746f8f96c FIX search on date into supplier invoice list dont work because of status -1 2016-04-25 11:25:49 +02:00
Marcos García de La Fuente
d98e50e661 Little change 2016-04-23 13:44:43 +02:00
Marcos García de La Fuente
aa64266c2f FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
Close #5008
2016-04-16 18:44:31 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Juanjo Menent
be0b7c86ff Merge pull request #4985 from marcosgdf/bug-4742
FIX #4742 Able to delete a supplier invoice with a registered payment
2016-04-10 11:52:21 +02:00
Marcos García de La Fuente
15d9273751 FIX #4747 Missing UI background when registering a supplier invoice payment
Close #4747
2016-04-10 00:30:31 +02:00
Marcos García de La Fuente
af473df214 FIX #4742 Able to delete a supplier invoice with a registered payment
Close #4742
2016-04-09 23:29:19 +02:00
Marcos García de La Fuente
1026484da1 FIX #4748 Supplier invoice payment confirmation amount is not translated
Close #4748
2016-04-09 22:48:42 +02:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
9ffaf9b218 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-03-04 14:51:59 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
7d336bd5d4 FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
Close #4414
2016-03-02 11:43:55 +01:00
fmarcet
77490bff71 FIX: Status filter don't work 2016-02-29 10:07:48 +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
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
cc524c8180 Fix bad picto 2016-02-19 04:41:29 +01:00
Laurent Destailleur
713050bd57 Fix style on payment page 2016-02-05 12:46:41 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
34c648b351 FIX #4418 2016-01-22 03:04:07 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late
to use them. Will be done into 4.0
2016-01-08 13:05:56 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
2016-01-02 12:27:08 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
phf
fffc8a430d FIX call trigger LINEBILL_SUPPLIER_CREATE 2015-12-31 15:48:16 +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
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
philippe grand
fc8c12d6f6 [Qual] Uniformize code 2015-12-10 16:14:37 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +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
b0e938fab4 Fix missing td cell 2015-11-29 13:15:02 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +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
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
Juanjo Menent
f15e83e918 Merge pull request #3937 from marcosgdf/bug-3877
FIX #3877 HTML encoded strings when searching for a supplier invoice
2015-11-08 11:19:49 +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
Marcos García de La Fuente
ba42a7779f FIX #3877 HTML encoded strings when searching for a supplier invoice
Close #3877
2015-11-07 14:34:26 +01:00