Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
53,283 Commits 36 Branches 190 Tags
fb53b41078fbe9cb15cf4c3501729a3747a580b0
Commit Graph

92 Commits

Author SHA1 Message Date
Frédéric FRANCE
adde434708 Update 3.9.0-4.0.0.sql 2016-04-21 08:52:10 +02:00
Laurent Destailleur
d9e846e586 Update migrate script 2016-04-21 02:47:34 +02:00
Laurent Destailleur
349c1c2d69 Merge pull request #4999 from fappels/develop 
Fix migration script
 2016-04-19 19:22:37 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
Laurent Destailleur
3a807d9cdb Revert a commit. The field was already added. 2016-04-18 21:07:26 +02:00
Laurent Destailleur
a88b3a8cc4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-18 21:02:34 +02:00
Laurent Destailleur
f68f5677bb Start to use the vat code to identify a vat into combo list instead of 
just "rate" and "npr".
 2016-04-18 21:02:14 +02:00
Juanjo Menent
5a87218622 Merge pull request #5034 from aspangaro/4.0-p19 
NEW: Accountancy - Add Result page
 2016-04-18 20:17:27 +02:00
Frédéric FRANCE
c6226e63b7 Update 3.9.0-4.0.0.sql 2016-04-18 08:13:01 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
Juanjo Menent
f86952dfaa FIX Add missing field fk_shipping_method_id 2016-04-15 16:57:11 +02:00
fappels
2462716eb4 Fix migration script 2016-04-12 16:24:00 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow. 
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
 2016-04-09 18:51:09 +02:00
Laurent Destailleur
874c65dfda Fix unique key of table 2016-04-09 10:13:56 +02:00
Laurent Destailleur
7b16482cee Add comment to show directoves to solve conception error on lot 
management (add a table to store all lots and their properties: date,
note, ...)
Removed deprecated field pmp at stock level (pmp is at product level)
 2016-04-09 10:01:22 +02:00
Laurent Destailleur
448758bbf4 Merge branch 'develop_NEW_supplier_price_reputation' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-04-08 22:01:55 +02:00
Laurent Destailleur
010a4f8929 Merge pull request #4945 from frederic34/shipcust 
NEW : Select Preferred Sending Method for a third party
 2016-04-08 21:31:06 +02:00
Laurent Destailleur
f14b03a230 NEW Add more trackable events (create, submit and receive supplier 
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
 2016-04-08 17:07:25 +02:00
Alexis Algoud
c2a5ad7d9c FIX sql 2016-04-06 10:05:03 +02:00
Laurent Destailleur
3738dae38d NEW Add date_rum into table of thirdparty bank account. 2016-04-05 12:06:47 +02:00
frederic34
198b9ce8fe Select Preferred Sending Method for a customer 2016-04-04 18:28:55 +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
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
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
1d780e7e77 NEW: Accountancy - Add category to manage the display of the income 
statement and the balance sheet

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-03-25 15:59:31 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +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
aspangaro
72abdde912 Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report 2016-03-22 12:57:45 +01:00
Florian HENRY
6138da8db6 Extend element type of action comm (for long name external modules) 2016-03-10 11:39:26 +01:00
Frédéric FRANCE
222ce45e0c Update 3.9.0-4.0.0.sql 2016-03-02 18:57:34 +01:00
Juanjo Menent
27b86be62b Remove from 4.0 2016-02-27 09:29:28 +01:00
Juanjo Menent
673cf602e9 NEW Added Malta VAT into migration script 2016-02-26 20:12:39 +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
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