Commit Graph

54672 Commits

Author SHA1 Message Date
Laurent Destailleur
997fd5ba5d Fix do not show no price because e already have default 2016-02-27 11:59:51 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Juanjo Menent
cf932d6124 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-02-27 09:45:40 +01:00
Juanjo Menent
486488795a FIX : Remove bad migration file for this version 2016-02-27 09:44:48 +01:00
Juanjo Menent
2af7d3a635 Merge pull request #4693 from simnandez/3.9
NEW : Add Malta VAT into 3.9
2016-02-27 09:42:44 +01:00
Juanjo Menent
4ed53edee8 Merge pull request #4692 from simnandez/develop
Remove from 4.0
2016-02-27 09:37:23 +01:00
Juanjo Menent
d50fb81e88 Merge pull request #4691 from aspangaro/3.9-p13
Fix: 3.9rc2 Lot of comestics corrections
2016-02-27 09:37:01 +01:00
Juanjo Menent
77173344fe NEW : Add Malta VAT into 3.9 2016-02-27 09:36:09 +01:00
Juanjo Menent
27b86be62b Remove from 4.0 2016-02-27 09:29:28 +01:00
aspangaro
7233adcede Merge remote-tracking branch 'Upstream/3.9' into 3.9-p13 2016-02-27 08:25:42 +01:00
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
aspangaro
41fb60e4a2 Fixed: comestic correction of company card 2016-02-27 06:38:48 +01:00
Juanjo Menent
c3b611a33d Merge pull request #4690 from simnandez/3.9
FIX : Improve and add missing translations As is not the branch develop, instead of transifex, we use GIT
2016-02-26 23:58:51 +01:00
Bahfir Abbes
4cbc1539b9 Fix: displays error when the supplier price does not exist. 2016-02-26 22:48:01 +01:00
Juanjo Menent
c2c6d77caa FIX : Improve and add missing translations
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949 FIX : Improve and add missing translations
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:17:22 +01:00
Juanjo Menent
f3f1bf8144 Merge pull request #4689 from simnandez/develop
NEW Added Malta VAT into migration script
2016-02-26 22:13:08 +01:00
Juanjo Menent
673cf602e9 NEW Added Malta VAT into migration script 2016-02-26 20:12:39 +01:00
Juanjo Menent
852f82e55c Merge pull request #4687 from defrance/patch-106
NEW add $scandir GETPOST
2016-02-26 19:52:46 +01:00
Juanjo Menent
a956195f85 Merge pull request #4688 from fmarcet/3.8
FIX: Some filters are lost when paging
2016-02-26 19:52:03 +01:00
Laurent Destailleur
4cf59d3f9b Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must
not show unpaid orders.
2016-02-26 19:13:25 +01:00
Laurent Destailleur
9a0af064bf Prepare rc2 2016-02-26 19:05:02 +01:00
Laurent Destailleur
0f04075006 Few pixels won 2016-02-26 16:13:48 +01:00
Laurent Destailleur
23f45c7b7e Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/commande/list.php
	htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
Laurent Destailleur
4250fe155a Fix showing ref of shipment on orders (lines too long) 2016-02-26 15:42:07 +01:00
Laurent Destailleur
1fa94e4d6a NEW Introduce position of records into dictionnary of type of contacts 2016-02-26 15:03:07 +01:00
Laurent Destailleur
a5554cc79e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-26 13:44:15 +01:00
Laurent Destailleur
c1ea597cb7 Redesign page with customer price to make it easier to understand. 2016-02-26 13:44:03 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
2e25c7969b Fix when setting a price for a product, selection of product must not
show any price
2016-02-26 12:22:32 +01:00
Laurent Destailleur
e115ac90ec Code comment 2016-02-26 12:08:04 +01:00
BENKE Charlie
8c85f17379 Update supplier_invoice.php 2016-02-26 12:02:53 +01:00
BENKE Charlie
145a87030c Update supplier_order.php 2016-02-26 12:01:55 +01:00
Florian HENRY
9ef5d02459 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-26 11:19:10 +01:00
Laurent Destailleur
16a716ebbc Merge pull request #4655 from defrance/patch-103
ODT generation : No segment defined in odt file is not an error
2016-02-26 11:15:34 +01:00
Laurent Destailleur
952f88b79c Merge pull request #4681 from defrance/patch-105
NEW Added Malta VAT
2016-02-26 10:56:03 +01:00
Laurent Destailleur
f330a1c8e5 Fix phpcs 2016-02-26 10:55:47 +01:00
Laurent Destailleur
7567336680 FIX #4683 2016-02-26 10:51:06 +01:00
Laurent Destailleur
b072b5a181 Fix remove some warnings
Conflicts:
	htdocs/core/lib/pdf.lib.php
2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1 Fix remove some warnings 2016-02-26 10:38:42 +01:00
abb
5e2261c9bd handle customer orders from supplier orders with id variable name correction
Conflicts:
	htdocs/fourn/commande/card.php
2016-02-26 01:26:16 +01:00
Laurent Destailleur
4b4de22a54 NEW Add hook pdf_build_address
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
2016-02-25 20:54:37 +01:00
Laurent Destailleur
54034ea852 NEW Add $object in parameter of pdf_build_address so we could include
hook into the function.
2016-02-25 18:30:31 +01:00
Laurent Destailleur
cdcad62967 FIX Array of linked elements for PDF contains duplicates and missing
data
2016-02-25 18:19:20 +01:00
Laurent Destailleur
0d6546e18e NEW Add an explanation message on shipment page to explain you can't
make shipment if order is not validated
2016-02-25 18:18:33 +01:00
Laurent Destailleur
7fc58ddabc FIX Array of linked elements for PDF contains duplicates and missing
data
2016-02-25 18:18:00 +01:00
Laurent Destailleur
8927948bef NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2016-02-25 16:27:28 +01:00
Laurent Destailleur
8c43276fda FIX Extrafields of shipments was not included into export fields 2016-02-25 15:46:14 +01:00
BENKE Charlie
f0736a30a6 Added Malta VAT
Hope use it Soon ;-)
2016-02-25 14:53:06 +01:00