Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
41,258 Commits 36 Branches 189 Tags
e62edc0a729fb168e793189ba872b51ec2dee325
Commit Graph

2073 Commits

Author SHA1 Message Date
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Laurent Destailleur
55c2659952 Fix: sql syntax error 2014-04-13 02:02:26 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
 2014-04-04 23:47:36 +02:00
Laurent Destailleur
cf8ff97855 Fix: Install of odt templates for project and tasks failed. 2014-04-02 13:17:20 +02:00
Laurent Destailleur
6806a87ebb Missing tms update 2014-04-02 11:02:18 +02:00
Laurent Destailleur
f027482b51 Merge pull request #1513 from KreizIT/fixtablestruct 
Fix installation script link to Task 1074 (missing new field)
 2014-03-27 16:06:51 +01:00
Raphaël Doursenaud
0d7a76d8db 3.6 migration script: fixed invalid comments 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
ee71e42b34 Action triggers: added missing triggers to 3.6 migration script 
These are the same changes than commit 3afb3a874d9d1533947651de9db28c9207278908 but for the
migration script
 2014-03-27 12:03:19 +01:00
Raphaël Doursenaud
c9c75a1c08 Action triggers: Added copyright 
Reindented the whole block because it was out.
 2014-03-27 12:02:15 +01:00
Raphaël Doursenaud
704699f9a1 Action triggers: added missing triggers to the data dictionnary 
These triggers were programmed in
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
but were nowhere to be found in the interface because they didn't hit the database.
 2014-03-27 12:02:15 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
KreizIT
5c837583c3 Fix installation script link to Task 1074 (missing new field) 2014-03-26 16:58:43 +01:00
Laurent Destailleur
c45f509984 Qual: Uniformizing payments 2014-03-26 15:41:09 +01:00
Laurent Destailleur
59042a30e1 Fix and uniformize code for payment of salaries. 2014-03-25 21:35:52 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases. 
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
 2014-03-21 16:22:41 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
6764d36434 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-19 11:46:30 +01:00
Laurent Destailleur
44952e353d Fix: Bad format for fk_currency fields (even if they are not used, i fix 
them).
 2014-03-19 11:46:06 +01:00
Laurent Destailleur
dbaea6fa42 Add clean sql requests into repair.sql 2014-03-19 11:40:23 +01:00
Laurent Destailleur
20ef4554e0 Fix: missing unique key on barcode field to avoid database corruption 2014-03-18 23:43:58 +01:00
Laurent Destailleur
9be52ca2c8 Fix: better way to remove duplicate barcode in repair.sql 2014-03-18 22:16:18 +01:00
Laurent Destailleur
a574997191 Qual: Add unique keys constraints on barcode. 2014-03-17 20:52:06 +01:00
Laurent Destailleur
e491a4dce7 Add code to clean duplicate records 2014-03-17 20:29:01 +01:00
Laurent Destailleur
7974ae96ad Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr 
into aternatik-cat_extrafields

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-03-16 21:38:29 +01:00
Laurent Destailleur
eb5e891cf9 Fix: Not mandatory field must not be not null 
Fix: field to store amount must be double(24,8)
 2014-03-16 20:37:43 +01:00
Jean-François Ferry
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
c9ac7fad82 Fix: Field should not be not null 2014-03-15 15:45:21 +01:00
Laurent Destailleur
271c2a8929 Merge pull request #1472 from atm-maxime/mko1074 
Task 1074 : add link to source document on stock movement
 2014-03-15 13:21:04 +01:00
jfefe
32bef2bf2f Missing text attribute on input field 2014-03-15 07:01:02 +01:00
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Laurent Destailleur
aab4800f87 Fix: sql syntax error with pgsql 2014-03-14 12:50:45 +01:00
Laurent Destailleur
3c842f9b6f New: Add barcode fields into user database. 2014-03-13 09:11:14 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
aspangaro
fca29f4312 Add table into script migration && key language 2014-03-06 21:29:20 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
d54dce1dbe Merge pull request #1452 from KreizIT/develop 
Correct multiline comments not manage by dolibarr
 2014-03-06 18:24:27 +01:00
Laurent Destailleur
cd3e56a2d0 Merge pull request #1450 from grandoc/develop 
fix english misspelling
 2014-03-06 18:23:51 +01:00
Laurent Destailleur
e9b9491a35 Clean database. Fix with firefox. 2014-03-05 12:15:47 +01:00
KreizIT
a80ecc8052 Correct multiline comments not manage by dolibarr 
Avoid error in loading data and also loading data which not be to.
 2014-03-05 12:06:01 +01:00
Laurent Destailleur
e9adec49eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1 New: Add filter on text and status into survey list. Can also sorter on 
id, text and date end.
 2014-03-05 11:22:01 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
KreizIT
c1f88d99b9 Batch number management step 1 : database modification 2014-03-03 14:11:19 +01:00
BENKE Charles
e5e7b4ce6a Update llx_00_c_pays.sql 
adding burundi in pays database
 2014-03-01 12:30:39 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00