lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,216 Commits 43 Branches 150 Tags 886 MiB
ba984254a5
Commit Graph

48216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
ba984254a5 Merge pull request #3096 from GPCsolutions/replaceaddress 
Allow replacing the address block
 2015-06-25 20:45:26 +02:00
Juanjo Menent
0f6aaf1461 Merge pull request #3094 from aspangaro/develop-patch41 
Accounting - Add field to edit in admin
 2015-06-25 20:42:37 +02:00
Juanjo Menent
d6b15d1be8 Merge pull request #3093 from aspangaro/develop-patch40 
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
 2015-06-25 20:41:56 +02:00
Raphaël Doursenaud
d6e48670e7 Allow replacing the address block 
Since ba2c0a2651 changed the default hook mode
from addreplace to output, this is needed to still be allowed to replace
the displayed address from a hook
 2015-06-25 11:13:23 +02:00
aspangaro
e20da5511d Accounting - Add field to edit in admin 2015-06-25 06:54:19 +02:00
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
Laurent Destailleur
a7aaa89e49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-24 18:33:04 +02:00
Juanjo Menent
759aec3925 Merge pull request #3084 from aspangaro/develop-patch37 
Fix: ER button set_paid & merge with old option setPaid
 2015-06-24 18:27:25 +02:00
Juanjo Menent
fc9d54fdaa Merge pull request #3088 from atm-maxime/develop 
New : add stats by qty on report turnover by product (+ clean code)
 2015-06-24 18:23:31 +02:00
Juanjo Menent
044edaaefc Merge pull request #3092 from FHenry/develop 
NEW : add extrafields into import product
 2015-06-24 18:20:47 +02:00
Juanjo Menent
9080470a64 Merge pull request #3089 from aspangaro/develop-patch39 
Fix travis
 2015-06-24 18:18:36 +02:00
Laurent Destailleur
fcc9fc6672 Fix translation 2015-06-24 16:54:44 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
aspangaro
b4b5dedaa9 Merge remote-tracking branch 'Upstream/develop' into develop-39 2015-06-24 07:02:48 +02:00
aspangaro
f65234e44f Fix travis 2015-06-24 07:01:15 +02:00
Laurent Destailleur
0780c84012 Fix missing payment mode into export invoice profile 2015-06-23 23:58:04 +02:00
Laurent Destailleur
bdba8f1f38 Fix courrent outstanding amount not visible 2015-06-23 23:33:25 +02:00
Maxime Kohlhaas
5e9c85c789 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-06-23 20:03:46 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9 Removed useless tab 2015-06-23 18:11:21 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
aspangaro
385857380b Remove old field 2015-06-23 06:39:55 +02:00
aspangaro
fae0a99a97 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-23 06:17:29 +02:00
Laurent Destailleur
460c926f98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-22 22:32:00 +02:00
Laurent Destailleur
4db562c9e7 Tags are shown as thumbs into card. 2015-06-22 22:31:44 +02:00
Laurent Destailleur
afc4529f7f Merge pull request #3080 from open-minds/develop 
Remove useless filter for "text" parameter of boxes content
 2015-06-22 20:32:08 +02:00
Maxime Kohlhaas
fdf1d953a9 New : add stats by qty on report turnover by product (+ clean code) 2015-06-22 19:22:13 +02:00
Laurent Destailleur
bfa0f0d576 Minor look enhancement 2015-06-22 17:20:06 +02:00
Laurent Destailleur
cac7b1f49f NEW Add hooks on list of members to allow an external module to add more 
fields into list view.
 2015-06-22 16:34:25 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
ea8279cf09 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-22 12:00:09 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
aspangaro
134cea194d Debug 2015-06-22 06:53:43 +02:00
Laurent Léonard
ba64486e68 Remove useless filter for "text" parameter of boxes content 
This filter doesn't allow to display "0" value and is not applied to the similar "text2" parameter.
 2015-06-22 02:53:28 +02:00
Laurent Destailleur
6e1a5ca401 Merge pull request #3078 from aspangaro/develop-patch38 
Fix: Accountancy list: Use print_liste_field_titre
 2015-06-21 23:30:49 +02:00
Laurent Destailleur
5975536fcf Support type of leave. 2015-06-21 23:25:01 +02:00
aspangaro
e0ae7bd430 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-21 21:09:55 +02:00
Laurent Destailleur
7d1d1caf30 Debug withdraw module 2015-06-21 17:09:00 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
aspangaro
390c670c5c Merge remote-tracking branch 'Upstream/develop' into develop-38 2015-06-21 14:35:45 +02:00
aspangaro
2ab454e757 Presentation 2015-06-21 14:32:00 +02:00
Laurent Destailleur
2612585d1c Merge pull request #3073 from atm-alexis/develop 
FIX hide product category if it's not enable
 2015-06-21 11:53:11 +02:00
Laurent Destailleur
8710065ca0 Merge pull request #3072 from atm-maximep/new_set_amount_for_withdraws 
NEW : Set amount for withdraws requests
 2015-06-21 11:52:23 +02:00
Juanjo Menent
35a9e164dc Merge pull request #3076 from aspangaro/develop-patch36 
Review ER : remove fk_c_tva and add  option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
 2015-06-21 10:57:17 +02:00
aspangaro
0f450edfcd Debug 2015-06-21 08:32:37 +02:00
aspangaro
0934860ce5 Accountancy list: Use print_liste_field_titre 2015-06-21 08:26:42 +02:00
aspangaro
f0a3057221 Fix: ER button set_paid & merge with old option setPaid 2015-06-21 08:07:06 +02:00
aspangaro
20582b9ea5 Merge remote-tracking branch 'Upstream/develop' into develop-36 2015-06-21 07:31:43 +02:00
Laurent Destailleur
d780c03651 Fix default buttone 2015-06-21 03:47:16 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00