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

1092 Commits

Author SHA1 Message Date
Laurent Destailleur
e7adae13ca Code comment 2016-04-05 12:59:17 +02:00
Laurent Destailleur
3738dae38d NEW Add date_rum into table of thirdparty bank account. 2016-04-05 12:06:47 +02:00
Laurent Destailleur
0f0850664d FIX Remove duplicates of shipment modes 2016-04-05 11:47:52 +02:00
frederic34
198b9ce8fe Select Preferred Sending Method for a customer 2016-04-04 18:28:55 +02:00
Florian HENRY
344a87f970 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-04-04 14:43:17 +02:00
Laurent Destailleur
f3c032ba21 Merge pull request #4925 from frederic34/patch-9 
Update llx_propal_merge_pdf_product.sql
 2016-04-04 00:34:40 +02:00
Laurent Destailleur
bd4bdcea37 Merge pull request #4924 from frederic34/patch-8 
FIX Remove sql error when creating table llx_usergroup_extrafields.sql
 2016-04-04 00:33:23 +02:00
Juanjo Menent
b3a5c8bae2 Merge pull request #4937 from simnandez/dolibarr-3510 
Close #3510 Add a numbering module for check deposits
 2016-04-03 16:22:34 +02:00
Juanjo Menent
8f2fb64efb Merge pull request #4929 from aspangaro/4.0-p12 
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
 2016-04-03 16:20:31 +02:00
Juanjo Menent
cd6c6f64c5 Merge remote-tracking branch 'upstream/develop' into dolibarr-3510 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-04-03 12:41:14 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
aspangaro
0c5f504881 FIX: Accountancy - Correct the display of account_parent 2016-04-02 06:22:31 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
081c7824d2 FIX : range is MySQL reserved word, cannot be used as column names 2016-04-01 14:00:14 +02:00
aspangaro
1df1e775ee Space2 2016-04-01 06:49:24 +02:00
aspangaro
84d326e036 FIX: Problem with dolibarr installation/migration script. Range is a reserved name. 2016-04-01 06:41:49 +02:00
Frédéric FRANCE
90e74b346e Update llx_propal_merge_pdf_product.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:13:38 +02:00
Frédéric FRANCE
125256c825 Update llx_usergroup_extrafields.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:11:17 +02:00
Frédéric FRANCE
1419b0e385 Update llx_establishment.sql 2016-03-31 17:06:10 +02:00
Laurent Destailleur
a15a46449c Merge pull request #4910 from aspangaro/4.0-p11 
NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)
 2016-03-30 14:00:50 +02:00
aspangaro
9cac252641 NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping) 2016-03-30 06:54:28 +02:00
aspangaro
c9271e04a0 Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-03-29 19:54:41 +02:00
aspangaro
8acf39cbb1 Uniformize name of table 2016-03-28 13:58:14 +02:00
aspangaro
432cc44ab6 NEW: Accountancy - Add category 2016-03-28 13:51:19 +02:00
aspangaro
85d51b0d6f Correct of problem of merging with my last commits 2016-03-28 07:46:55 +02:00
Laurent Destailleur
22bed60a07 Remove manually other PR that should not be validated (travis errors 
reported on PR with serious mysql error in migration due to use of
reserved keyword "range" as a name of a field).
 2016-03-26 11:19:45 +01:00
aspangaro
252f37b363 NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet 2016-03-23 21:36:52 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
d663b28dac Fix no database structure change is allowed into minor versions 2016-03-10 13:49:13 +01:00
Florian HENRY
b58e155a6f FIX : #4785 2016-03-10 12:22:49 +01:00
Florian HENRY
6138da8db6 Extend element type of action comm (for long name external modules) 2016-03-10 11:39:26 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Florian HENRY
4bf2da4af7 revert SQL changes 2016-03-08 10:24:59 +01:00
Regis Houssin
25686e82c9 Fix: best compatibility with multicompany and others security issue 2016-03-03 08:49:24 +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
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
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
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
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
8f866254ac add model_pdf fields for edition feature 2016-02-19 15:47:37 +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
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