Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 01:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

6342 Commits

Author SHA1 Message Date
IJ
c2f1826ac9 Add status 2016-11-12 21:36:47 +00:00
IJ
fd63c91a18 Add Missing Translation String - Expense Report 
Add Debit/Credit Card (text) to Expense Report payment type form fields when used.
 2016-11-12 21:00:21 +00:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
Maxime Kohlhaas
d18adc1231 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-11-12 09:02:35 +01:00
aspangaro
c65678d00a Update cactus numbering model 2016-11-11 07:36:26 +01:00
Laurent Destailleur
e4c4ced5a3 Complete work on usin dol_banner 2016-11-11 01:55:53 +01:00
Laurent Destailleur
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
9fd5ddf807 NEW Add REST API for projects 2016-11-09 22:54:51 +01:00
Laurent Destailleur
c45c24f80c FIX Must use external link into a forged email content. 2016-11-08 23:18:43 +01:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
5fb8ba8ee7 Better help to explain suggested account 2016-11-07 11:42:20 +01:00
Laurent Destailleur
84ed82bb08 Better error message 2016-11-07 00:20:30 +01:00
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +01:00
Maxime Kohlhaas
e5418a7624 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-11-06 11:36:08 +01:00
Laurent Destailleur
ebe3ed9ad4 Uniformize code 2016-11-04 17:48:20 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
6ceb79cf5a Uniformise look and feel 2016-11-03 20:55:55 +01:00
Laurent Destailleur
59291be6e0 NEW Can filter on status on objects on the "statistics" page. 2016-11-03 19:50:04 +01:00
Laurent Destailleur
6661773a06 Clean menu 2016-11-03 16:40:55 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
03b882d095 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:44:55 +02:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
5654a4609e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-28 12:00:46 +02:00
Laurent Destailleur
6938b05219 Mutualize code to show files generated for mass actions 2016-10-28 12:00:30 +02:00
Juanjo Menent
a59cf0e13b Merge pull request #5935 from aspangaro/5.0-p32 
Accountancy - Add binding and journal for expense reports
 2016-10-28 11:25:21 +02:00
aspangaro
029fa1ed8a Finishing works 2016-10-27 06:04:23 +02:00
Laurent Destailleur
54bd355800 Better help 2016-10-27 02:02:40 +02:00
Laurent Destailleur
d27ffd4194 Merge pull request #5393 from frederic34/patch-10 
NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order
 2016-10-26 11:48:02 +02:00
Laurent Destailleur
d47fc281b0 Better accountancy tutorial 2016-10-26 11:15:25 +02:00
Laurent Destailleur
75695fafa6 Merge pull request #5917 from aspangaro/5.0-p31 
Accountancy - Add menu expense report accounts in configuration
 2016-10-26 11:03:00 +02:00
Laurent Destailleur
27808b7f81 Merge pull request #5915 from aspangaro/5.0-p29 
NEW Expense report documents are now available in ECM module
 2016-10-26 10:57:23 +02:00
Laurent Destailleur
11c4f49a15 FIX #5924 2016-10-26 10:42:34 +02:00
aspangaro
8800bf8b25 Update works 2016-10-26 07:46:48 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
IJ
dcd11f0c71 FIX: Missing Supplier Order Translation String 2016-10-24 23:20:24 +01:00
Sergio Sanchis Climent
2a4517e1bc FIX: #5907 2016-10-24 19:21:41 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
8222f7a78b Fix translation 2016-10-24 12:24:46 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00