Frédéric FRANCE
eb2cc110fc
phpcs
2015-02-28 10:49:14 +01:00
Juanjo Menent
a67d0f712c
Trad: Syncro from transifex
2015-02-27 18:21:41 +01:00
Juanjo Menent
856c8f24de
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:14:45 +01:00
Laurent Destailleur
a87c867c28
Translation
2015-02-26 16:02:03 +01:00
Laurent Destailleur
8f378b4480
Fix no error returned when contact already exists
2015-02-26 15:52:14 +01:00
Laurent Destailleur
22318bb800
Fix missing tables
2015-02-26 14:05:23 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
fe7889e266
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
386eaf0911
Fix: bad sql request
2015-02-26 12:11:31 +01:00
Laurent Destailleur
b9d3175897
Fix typo
2015-02-25 23:04:13 +01:00
Laurent Destailleur
be529e7269
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-02-25 16:53:33 +01:00
Laurent Destailleur
76640b6b77
Fix removed warning
2015-02-25 15:01:25 +01:00
Laurent Destailleur
89684748c5
Debug incdec option.
2015-02-24 19:55:59 +01:00
Laurent Destailleur
d688db3b78
Merge branch 'atm-alexis-feature_Product_stock_subproduct_stock_independent' into develop
2015-02-24 17:24:11 +01:00
Laurent Destailleur
1c04af2e55
Merge branch 'feature_Product_stock_subproduct_stock_independent' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent
Conflicts:
htdocs/langs/en_US/products.lang
2015-02-24 17:23:23 +01:00
Laurent Destailleur
3fb3e4af4e
Merge pull request #2386 from lrq3000/3.7
...
Fix lastrowid-*table* option when defining imports
2015-02-24 17:16:17 +01:00
Laurent Destailleur
fec9e222b1
Merge pull request #2391 from aspangaro/develop-patch10
...
FIXED: Module Expense Report - Correct init
2015-02-24 17:11:32 +01:00
Laurent Destailleur
fd9fc191fc
Merge pull request #2388 from aspangaro/develop-patch8
...
Module Expense Report: reactivate conflict with modDeplacement
2015-02-24 17:06:43 +01:00
Laurent Destailleur
625c494dee
Merge pull request #2385 from aspangaro/3.7-patch5
...
FIXED: Bankjournal is generated from id_account now
2015-02-24 17:04:01 +01:00
Laurent Destailleur
f23234356e
Merge pull request #2387 from aspangaro/develop-patch7
...
Move new module Expense Report in hrm
2015-02-24 17:03:12 +01:00
Laurent Destailleur
e8e81dba2b
Merge pull request #2392 from aschio/develop
...
NEW: added fields and relative filters in contracts list page
2015-02-24 17:02:47 +01:00
Laurent Destailleur
84581212db
Merge pull request #2395 from aspangaro/develop-patch13
...
NEW: Add button to purge search criteria into list of expense report
2015-02-24 17:02:08 +01:00
Laurent Destailleur
57ecb543ae
Merge pull request #2393 from aspangaro/develop-patch11
...
FIXED: Correct field note - Add note_private & use wysiwyg editor
2015-02-24 17:01:53 +01:00
Laurent Destailleur
c18fe2a8b9
Merge branch 'mrsof-develop' into develop
2015-02-24 17:01:04 +01:00
Laurent Destailleur
203ff13a62
Merge branch 'develop' of https://github.com/mrsof/dolibarr into
...
mrsof-develop
Conflicts:
htdocs/comm/card.php
2015-02-24 17:00:52 +01:00
Laurent Destailleur
714b3d277c
Merge pull request #2394 from aspangaro/develop-patch12
...
FIXED: Update licence to GPLv3
2015-02-24 16:56:01 +01:00
Laurent Destailleur
474a4125a4
It is better to point to portal home page instead of sub page.
2015-02-24 16:51:20 +01:00
Laurent Destailleur
3e853b4129
Bad comment char
2015-02-24 16:17:52 +01:00
Laurent Destailleur
70c778c728
I keep this feature hidden, because according to package target,
...
dolibarr does not contains same files. We must first find a solution
before making this feature public.
2015-02-24 15:49:39 +01:00
Laurent Destailleur
562348eb34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1
Fix missing fields into import of thirdparties.
...
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
2015-02-24 15:40:50 +01:00
Sof
5599deec00
FIX : Edit in place of "Outstanding Limit"
...
Edit in place not working for field "Outstanding Limit" in view mode for third party :
- Field type 'amount' do not work in "Edit in place" mode.
- Update returns an error "Unknown field 'OutstandingBill' in field list" when in "Edit in place" mode.
2015-02-24 13:44:00 +01:00
Laurent Destailleur
44c392ca23
Fix missing profid5 and 6
2015-02-24 13:35:37 +01:00
Laurent Destailleur
e55d3489aa
Little clean of feature several price per customers
2015-02-24 12:58:43 +01:00
Laurent Destailleur
cae82104ca
Clean tool to generate checksum file
2015-02-24 12:44:12 +01:00
Laurent Destailleur
4e4df4fa22
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-24 11:25:32 +01:00
Laurent Destailleur
9842e816d0
Fix bad sql type
...
Fix no input outside tr-td
2015-02-24 11:24:15 +01:00
Laurent Destailleur
eb4eededbd
Add class to manage table commande_fournisseur_dispatch
2015-02-24 11:19:47 +01:00
Laurent Destailleur
472181a03b
Merge pull request #2374 from frederic34/filecheck
...
Files Integrity Checker
2015-02-24 10:08:39 +01:00
Laurent Destailleur
bbc82e829b
Fix bad sql request
2015-02-23 23:28:55 +01:00
Laurent Destailleur
0a5c3e1fa8
Fix price must be hidden if context is not on sell
2015-02-23 23:15:41 +01:00
aspangaro
15aac509d2
NEW: Add button to purge search criteria into list
2015-02-23 22:36:26 +01:00
aspangaro
6436179fb6
Correct
2015-02-23 22:18:39 +01:00
aspangaro
c1069eea47
FIXED: Update licence to GPLv3
2015-02-23 22:04:01 +01:00
aspangaro
40fa32509c
Add doleditor & typo
2015-02-23 21:51:29 +01:00
aspangaro
9dadd16724
FIXED: Correct problem field with note - Add note_private & use wysiwyg editor
2015-02-23 21:44:33 +01:00
aspangaro
be3fd5529a
FIXED: Module Expense Report - Correct init
2015-02-23 20:31:44 +01:00
cla
2ef654045b
ADD: new fields and relative filters in contracts list page
2015-02-23 20:26:34 +01:00
Laurent Destailleur
afa8e5c6d8
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-23 19:50:51 +01:00
