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

46411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
phf
9eed66d998 [CORE] FIX : Travis phptest (#incoterm). 2015-02-23 11:46:39 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
phf
11a0624e39 [CORE] FIX Travis phpcs (#incoterm). 2015-02-23 11:19:00 +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
abda67adc2 Improved testGetBrowserInfo 2015-02-23 10:45:22 +01:00
phf
52441914de Vas avec le merge précédent 2015-02-23 10:42:34 +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
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
Marcos García de La Fuente
102d2d9d36 Added IE11 test to testGetBrowserInfo 2015-02-23 10:39:02 +01:00
phf
c459794999 [CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm). 2015-02-23 10:36:44 +01:00
phf
81130634d3 [CORE] intégration de incoterm sur les différentes class (#incoterm). 2015-02-23 09:16:14 +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