lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,052 Commits 43 Branches 150 Tags 886 MiB
42e43791ef
Commit Graph

39648 Commits

Author SHA1 Message Date
Juanjo Menent
88d1d203d8 Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:13:24 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Juanjo Menent
7ca8fdb20c PHP norms 2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
Laurent Destailleur
828716420b Comment of function was not correct 2015-02-26 16:19: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
d6438a51ab Add log to help track bug 2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +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
Marcos García de La Fuente
fb959abc63 Misc PHPdoc fixes 2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179 Undefined variable + Unreachable statement 2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075 Marked getStaticMember as deprecated 2015-02-25 18:03:31 +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
Marcos García de La Fuente
40a5c15616 Improved getBrowserInfo documentation 2015-02-25 16:45:14 +01:00
Marcos García de La Fuente
f598963d6b Fixed regression 2015-02-25 16:41:51 +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
Alexis Algoud
5bc3763945 fix supplier order element 2015-02-24 18:23:40 +01:00
Alexis Algoud
b4f3068141 NEW add PDF icon on linked element into project 2015-02-24 18:20:19 +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
72da9b52af Merge pull request #2380 from marcosgdf/bug-1825 
Better fix for bug 1825
 2015-02-24 17:07:17 +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
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
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
Laurent Destailleur
4128c86035 Fix: Filter on statut was lost 2015-02-23 19:31:42 +01:00
Laurent Destailleur
94a5f87bd8 comment 2015-02-23 15:13:14 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
d3a79c8724 Fix default entity guess 2015-02-23 14:44:24 +01:00
Laurent Destailleur
570194b4b9 Fix validation of email when there is a comma separator. 2015-02-23 13:10:18 +01:00
Alexis Algoud
29e5b89352 erase some comments 2015-02-23 12:26:27 +01:00
Alexis Algoud
0c53121553 - use incdec into virtual product definition. 
- improve screen of virtual product
 2015-02-23 12:19:19 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
Marcos García de La Fuente
7e07638fba Little refactor 2015-02-23 10:51:43 +01:00
Alexis Algoud
72908c1fd3 Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent 2015-02-23 10:51:41 +01:00
Marcos García de La Fuente
71b98ee82b Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them. 2015-02-23 10:42:10 +01:00
aspangaro
d0cc072a58 Module Expense Report: reactivate conflictwith modDeplacement 2015-02-23 06:49:11 +01:00
aspangaro
95f211775b Move new module Expense Report in hrm 2015-02-23 06:45:03 +01:00
Laurent Destailleur
dbaef5ca6b Fix link does not return same number that nmber into link 2015-02-23 01:00:07 +01:00
Laurent Destailleur
25bb6a588f Fix list of project must be restricted on opened status 2015-02-23 00:57:48 +01:00
Laurent Destailleur
1bba3a01e2 phpcs 2015-02-22 23:41:34 +01:00
Laurent Destailleur
b04682db4c Fix Edit of extrafield on supplier invoice or order was deleteing other 
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
 2015-02-22 17:41:02 +01:00
Laurent Destailleur
6e10dd3cce Trad 2015-02-22 17:10:13 +01:00
Laurent Destailleur
4781707fa4 Fix jodconverter can't work without the wrapper jodconverter. 2015-02-22 16:01:01 +01:00
aspangaro
4ba095cb5c FIXED: Bankjournal is generated from id_account now 2015-02-22 15:04:18 +01:00
Stephen L
fe62e038ca Fix lastrowid-*table* option when defining imports (fix extrafields fk_object value) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2015-02-22 14:34:51 +01:00
aspangaro
cda6e7adf9 Delete cash journal 2015-02-22 14:20:42 +01:00
Marcos García de La Fuente
702c19dab3 Refactored function getBrowserInfo 2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
frederic34
ad3e91dc9f WIP 2015-02-21 14:06:33 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
d2da098336 Fixed example 2015-02-21 10:00:31 +01:00
Laurent Destailleur
2b045ba74a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 09:52:59 +01:00
Laurent Destailleur
2b4f7a41bf Merge pull request #2377 from aspangaro/develop-patch5 
NEW: Update PHPExcel library to 1.8.0
 2015-02-21 00:22:21 +01:00
Laurent Destailleur
6e66197621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-20 23:49:06 +01:00
Laurent Destailleur
1ca4e377d5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-20 23:47:09 +01:00
Laurent Destailleur
03751d61f2 Merge pull request #2376 from aspangaro/develop-patch4 
Update FPDI library to 1.5.2
 2015-02-20 23:46:33 +01:00
Laurent Destailleur
7681e238be Merge pull request #2372 from frederic34/patch-2 
Update account.class.php
 2015-02-20 23:35:15 +01:00
Laurent Destailleur
d9ab05833f Merge pull request #2370 from braito4/patch-1 
[FIX #1833] Permissions in contact/note.php wrong
 2015-02-20 23:31:55 +01:00
Laurent Destailleur
6952f33309 Restore data into bannner of thirdparty to have content matching other 
tabs.
 2015-02-20 23:29:55 +01:00
Laurent Destailleur
9ac38dee45 Merge pull request #2367 from marcosgdf/bug-1652 
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
 2015-02-20 23:27:53 +01:00
Laurent Destailleur
56635cea98 Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1790

Conflicts:
	ChangeLog
 2015-02-20 23:23:57 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00