aspangaro
452733263d
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
2015-06-25 06:37:26 +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
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
27cc7ef2b3
Time spent
2015-06-23 10:13: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
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
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
Laurent Destailleur
4f1538f502
Introduce table llx_c_holiday_type
2015-06-21 03:19:15 +02:00
Laurent Destailleur
825369230f
Finishment of look
2015-06-20 23:33:13 +02:00
Laurent Destailleur
bbce287892
Fix: Pdf merge tool must see only pdf files
2015-06-19 16:05:04 +02:00
maxime peyrot
f99a127a57
NEW : Enter amount for withdraws requests
2015-06-19 13:45:14 +02:00
aspangaro
d92eab49de
Add the payment in bank module
2015-06-16 05:47:24 +02:00
jfefe
745f0f7d7e
Fix crlf
2015-06-15 14:24:24 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Regis Houssin
b96ed08260
Fix: select date problem with mobile device ( #3039 )
2015-06-14 12:46:27 +02:00
Juanjo Menent
5edfef2525
Merge pull request #3006 from hregis/develop_productprice
...
Fix: disable hook calling
2015-06-12 21:38:14 +02:00
Juanjo Menent
0596be1656
Merge pull request #3008 from hregis/develop_strict
...
Fix: ereg more simple
2015-06-12 21:24:13 +02:00
Marcos García de La Fuente
200eb7b1bb
FIX Close bug #2855 Wrong translation key in localtax report page
2015-06-12 16:27:17 +02:00
fmarcet
42b04102ba
New: Add due date filter on invoices lists
2015-06-11 12:40:16 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Regis Houssin
3fd7c26cf1
Fix: disable hook calling
2015-06-11 07:52:58 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Laurent Destailleur
f7eaf35d30
NEW When creating order, proposal or invoice from thirdparty card, the
...
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
2015-06-03 11:55:39 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
03c06b3cf8
Merge pull request #2916 from aspangaro/develop-patch23
...
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
Laurent Destailleur
f5ec2c0605
Merge pull request #2911 from aspangaro/develop-md
...
NEW Forms are using the tab look, even in creation mode
2015-05-30 15:01:26 +02:00
Laurent Destailleur
07ae39fc38
Merge pull request #2910 from aspangaro/develop-patch21
...
Fix: wrong link
2015-05-30 15:00:30 +02:00
phf
9f52b9e800
FIX : #2901
2015-05-29 17:27:05 +02:00
Laurent Destailleur
65c7ab7a93
Fix: Introduce error by default when function is used as a true delete
...
function.
2015-05-29 17:11:42 +02:00
aspangaro
0bd07b795f
NEW: Add tab document on salaries payment
2015-05-28 07:33:50 +02:00
aspangaro
432cf998fa
Fiche-rec: Forms are using the tab look, even in creation & add cancel button
2015-05-28 05:25:29 +02:00
aspangaro
8eee0bdf73
NEW Forms are using the tab look, even in creation mode
2015-05-27 07:41:25 +02:00
aspangaro
5f5388a52a
Fix: wrong link
2015-05-27 07:19:10 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
dcc197eb6b
Fix bug debian 786479
2015-05-22 17:13:32 +02:00
