Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

3149 Commits

Author SHA1 Message Date
Laurent Destailleur
1fa94e4d6a NEW Introduce position of records into dictionnary of type of contacts 2016-02-26 15:03:07 +01:00
BENKE Charlie
f0736a30a6 Added Malta VAT 
Hope use it Soon ;-)
 2016-02-25 14:53:06 +01:00
Laurent Destailleur
715b2024cd Better repair script 2016-02-24 17:17:41 +01:00
Laurent Destailleur
371dec8503 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/companies.lang
 2016-02-24 12:13:12 +01:00
Juanjo Menent
6db0f01fa4 FIX : Bad Argentina provences 2016-02-22 19:53:39 +01:00
Laurent Destailleur
ff9a82c96f Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment 
New add multicurrency supplier invoice payment
 2016-02-22 16:26:31 +01:00
Laurent Destailleur
f759f26db9 Fix travis error 2016-02-22 16:20:21 +01:00
phf
fd4cda819c New add supplier payment 2016-02-21 22:47:52 +01:00
Benoît Peccatte
c969b09ef7 Add support to product translation imports 2016-02-21 22:04:47 +01:00
Laurent Destailleur
351ce6228d NEW Add width and height on product card 2016-02-20 04:49:02 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
0a02d58afb Merge pull request #4656 from defrance/patch-104 
Add model_pdf fields for edition feature on product
 2016-02-20 02:29:58 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
 2016-02-19 20:17:51 +01:00
Laurent Destailleur
f8956f785d Fix syntax error 2016-02-19 16:12:39 +01:00
Laurent Destailleur
6ab8ba1cb1 Fix sql error 2016-02-19 16:10:14 +01:00
BENKE Charlie
d96c89afa1 Update 3.9.0-4.0.0.sql 2016-02-19 15:55:59 +01:00
BENKE Charlie
8f866254ac add model_pdf fields for edition feature 2016-02-19 15:47:37 +01:00
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All 
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
 2016-02-19 02:41:00 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
9d418bca7f Merge branch 'new_add_customer_multicurrency_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-16 15:06:39 +01:00
Laurent Destailleur
8fb0f8d9d1 Merge branch 'patch-100' of https://github.com/defrance/dolibarr into 
defrance-patch-100

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/user/card.php
 2016-02-16 13:54:56 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351 Add fields to link recurring invoice lines with contract origin when it 
comes from this.
 2016-02-15 16:13:33 +01:00
Laurent Destailleur
d4c3258385 Fix missing field 
Fix bad value for default value of next date
 2016-02-15 07:36:45 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
e8bc88fffe Merge branch 'new_recurring_invoice' of 
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:45:39 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
BENKE Charlie
23cb0d437c Update 3.9.0-4.0.0.sql 2016-02-13 10:53:01 +01:00
BENKE Charlie
b21b5e7bb8 Create llx_categorie_user.key.sql 2016-02-13 10:51:24 +01:00
BENKE Charlie
e3444e08a7 Create llx_categorie_user.sql 2016-02-13 10:50:46 +01:00
Laurent Destailleur
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +01:00
phf
c4812abd62 Fix can update fields of facture rec 
Fix create invoice from facture rec don't get all properties and add fk_account
 2016-02-12 12:31:43 +01:00
Frédéric FRANCE
ad534c90e6 Update 3.8.0-3.9.0.sql 2016-02-12 10:34:21 +01:00
phf
875e01aeee New add recurrence fields on create form of invoice model 
Fix missing fields in database about multicurrency
 2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8 New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
Florian HENRY
23e35a6012 update size of elementtype column into llx_actioncomm (module_subelement 
name can be longer than 32)
 2016-02-10 14:21:57 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
fcf1e20d5b Merge pull request #4578 from frederic34/sticker 
Dictionnary for label sticker and card format
 2016-02-08 14:49:31 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
Laurent Destailleur
2e1011ca0c Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that 
seems useless.
 2016-02-06 12:29:02 +01:00
frederic34
e079021de3 data 2016-02-06 12:16:12 +01:00
frederic34
0d11d94234 Merge remote branch 'upstream/develop' into sticker 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-06 12:12:35 +01:00
frederic34
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
Laurent Destailleur
cb66448148 Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields 
NEW feature hidden extrafields
 2016-02-05 17:22:51 +01:00