Commit Graph

48409 Commits

Author SHA1 Message Date
a-schild
cfaf4902f2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-07-08 15:17:26 +02:00
Juanjo Menent
7e0229ded0 Merge pull request #3168 from aspangaro/develop-patch54
Update accountancy 1st step
2015-07-08 12:03:49 +02:00
a-schild
64d4a08dc6 Added translations, corrected title printing in the new way 2015-07-08 09:58:51 +02:00
a-schild
43897d913e Corrected center to html5 css class instead of center tag 2015-07-08 09:44:59 +02:00
a-schild
3ffbb800d2 Merge remote-tracking branch 'upstream/develop' into develop 2015-07-08 09:26:21 +02:00
a-schild
8353e1d462 Show due days in make payments 2015-07-08 09:18:04 +02:00
a-schild
2999d0b37a Show due days in not payed supplier bills 2015-07-08 08:58:30 +02:00
aspangaro
a283d0ce93 Update from elarifr 2015-07-08 07:46:26 +02:00
aspangaro
4c72567c6b Update bookkeeping 2015-07-08 07:19:23 +02:00
aspangaro
f084a9472a Merge remote-tracking branch 'Upstream/develop' into develop-54 2015-07-08 07:05:43 +02:00
Laurent Destailleur
455a697f1a Merge pull request #3159 from marcosgdf/develop
FIX #2832: Fixed a problem with special characters in expense report PDF model
2015-07-07 19:35:50 +02:00
Laurent Destailleur
f0cc620296 Merge pull request #3160 from marcosgdf/more-oop2
Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove
2015-07-07 19:33:46 +02:00
a-schild
0fe39d4e4b Show due date when creating payments, so user can select the bills to pay 2015-07-07 18:33:09 +02:00
a-schild
134f13c63f Removed conflict code from merge/checkout 2015-07-07 18:17:22 +02:00
a-schild
1dfb0cac4e Allow filtering on date fields for supplier factures 2015-07-07 18:08:10 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
98344746cf Added missing scopes of modMyModule 2015-07-07 13:08:17 +02:00
Marcos García de La Fuente
56ff0c7350 Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove 2015-07-07 13:08:12 +02:00
Marcos García de La Fuente
b7809c788a FIX #2832: Fixed a problem with special characters in expense report PDF model 2015-07-07 12:27:36 +02:00
aspangaro
787d2310c1 Correct language key 2015-07-07 05:57:35 +02:00
Laurent Destailleur
0fd134f825 Merge pull request #2889 from GPCsolutions/commonobjectreview
[Qual] Reviewed commonobject
2015-07-06 23:57:34 +02:00
Laurent Destailleur
00d2047e4c Merge pull request #3152 from GPCsolutions/install
Install
2015-07-06 23:55:14 +02:00
Laurent Destailleur
43c0e7e249 Merge pull request #3150 from marcosgdf/more-oop
Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
2015-07-06 23:52:00 +02:00
Laurent Destailleur
cfd5ca15fd Merge pull request #3153 from GPCsolutions/jquery
Fix: jquery path
2015-07-06 23:51:03 +02:00
Raphaël Doursenaud
5ebc84e999 [Qual] Reviewed commonobject
Added missing fields
Removed unused variables
Documented methods parameters
Checked return points
2015-07-06 17:03:25 +02:00
Raphaël Doursenaud
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
Raphaël Doursenaud
f3c319958f Fix: no PHP closing tag in generated files
Best practice
2015-07-06 16:39:49 +02:00
Raphaël Doursenaud
c28e863e2f Fix: jquery path 2015-07-06 16:39:42 +02:00
Raphaël Doursenaud
ef90cd39f8 Uniformized install logging 2015-07-06 16:34:31 +02:00
Raphaël Doursenaud
572ce7bcbb NEW: Rename install etape to step 2015-07-06 15:44:33 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Marcos García de La Fuente
670596685f Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
Related to #2670
2015-07-05 13:34:06 +02:00
Laurent Destailleur
089056f024 Filter on status on hierarchical view 2015-07-05 12:15:21 +02:00
aspangaro
627429326e Merge remote-tracking branch 'Upstream/develop' into develop-54 2015-07-05 05:59:10 +02:00
aspangaro
54d2a96d8e dir DOL_URL_ROOT 2015-07-05 05:56:45 +02:00
Laurent Destailleur
04ba12fab6 Add es_BO and fy_NL 2015-07-04 22:18:31 +02:00
Laurent Destailleur
1b6922fe81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 18:20:34 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
eef7c995da Merge pull request #3149 from aspangaro/develop-patch53
Accountancy: Bank journal - Show user on salary payment & use new account to pay vat
2015-07-04 17:37:07 +02:00
Laurent Destailleur
cf7839f5fa Merge pull request #3148 from aspangaro/develop-patch52
New: Task #2567 Add accountancy code for VAT payments
2015-07-04 17:36:07 +02:00
aspangaro
ea4b7b98a1 Merge remote-tracking branch 'Upstream/develop' into develop-53 2015-07-04 16:41:53 +02:00
aspangaro
fc3995c0be Accountancy: Bank journal - Show user on salary payment & user new account to pay vat 2015-07-04 16:39:52 +02:00
aspangaro
56831ecd16 Correct travis 2015-07-04 16:13:44 +02:00
aspangaro
7bf1ea2cac New: Task(#2567) Add accountancy code for VAT payments 2015-07-04 15:48:43 +02:00
Laurent Destailleur
9b532e0dd4 Merge pull request #3147 from aspangaro/develop-patch51
Fix: md_exp borders have different colors
2015-07-04 15:04:19 +02:00
aspangaro
d1111f9b90 Merge remote-tracking branch 'Upstream/develop' into develop-51 2015-07-04 15:01:11 +02:00
aspangaro
556db60f22 Fix: md_exp borders have different colors 2015-07-04 14:59:20 +02:00
Laurent Destailleur
d5a4a98c22 FIX #3138 - Too much visible thing when access is denied on public pages 2015-07-04 14:56:43 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
45d27ae250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:50:57 +02:00