Regis Houssin
28757c8d88
Fix: missing commit
2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a
Fix: broken features
2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504
Fix: broken features
2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492
Mutualize code for security check when accessing a document by document.php and bywebservice
2013-04-22 15:00:29 +02:00
Regis Houssin
1be6a2c120
Fix: broken features for fileupload
2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e
Fix: broken features for fileupload
2013-04-22 14:37:18 +02:00
Laurent Destailleur
e65e6516c5
Fix: Logon theme on amarok
2013-04-22 14:33:47 +02:00
Laurent Destailleur
54040bed1d
Fix: No slash alone
2013-04-22 12:48:56 +02:00
Laurent Destailleur
5cbb0359aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd
Fix: Some translation change to have things more clear.
2013-04-22 10:33:06 +02:00
Regis Houssin
ab4a3dcaa7
Fix: missing rename field
2013-04-22 10:18:03 +02:00
Laurent Destailleur
89ad634230
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Laurent Destailleur
9b07271460
Merge pull request #864 from jfefe/doc_ods
...
Task [#838 ] : Can generate ods document on thirdparty
2013-04-21 16:32:07 -07:00
Laurent Destailleur
11023fa210
Merge pull request #857 from marcosgdf/task-823
...
New: [ task #823 ] Shipping_validate email notification
2013-04-21 16:07:37 -07:00
Laurent Destailleur
e19e0ff557
Fix: Error management
2013-04-22 00:57:56 +02:00
Laurent Destailleur
3f09cbec7e
Merge pull request #855 from marcosgdf/minor-refactor
...
ECM Refactor
2013-04-21 15:18:15 -07:00
Laurent Destailleur
9f3164d710
Merge pull request #849 from GPCsolutions/ca_report_improvments
...
Improved reports
2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317
Merge pull request #865 from FHenry/develop
...
Add extrafield select from table
2013-04-21 15:12:04 -07:00
Laurent Destailleur
5893fadb58
Look: Minor style enhancement
2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6
Add extrafield select from table
2013-04-21 17:36:23 +02:00
JF FERRY
642ba10d84
New hidden option to introduce timing value into odt document nam
2013-04-21 17:04:54 +02:00
Laurent Destailleur
f4513d1beb
Move option ate better place
2013-04-21 16:01:36 +02:00
JF FERRY
83028b958a
Task #838 : retieve extension to work with ods document
2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20
Task #838 - change regex to look at ods document too
2013-04-21 14:55:32 +02:00
Marcos García
82e3a8d0b9
New: [ task #823 ] Shipping_validate email notification
2013-04-21 14:14:30 +02:00
Marcos García
293fc89a9f
Missing copyright
2013-04-21 12:45:34 +02:00
Marcos García
17902a8455
Removed var_dump
2013-04-21 12:44:13 +02:00
Marcos García
7befeae371
ECM Refactor
2013-04-21 12:42:58 +02:00
Laurent Destailleur
ab2709f684
Filter on agenda event are autoselected on "manual event".
2013-04-21 12:26:44 +02:00
Laurent Destailleur
a7f169d102
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6
Fix: pgsql compatibility
2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246
Merge pull request #851 from FHenry/develop
...
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
2013-04-20 12:02:16 -07:00
Laurent Destailleur
12caa20e38
Merge pull request #850 from atm-maxime/develop
...
Carrier conf modification
2013-04-20 11:42:44 -07:00
Laurent Destailleur
4d54b8a22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-20 20:30:48 +02:00
Laurent Destailleur
dd13c334c7
New: Compatibility with jmobile
2013-04-20 20:30:18 +02:00
Laurent Destailleur
2008fd1419
Fix: Optimize for small screen
2013-04-20 17:49:24 +02:00
fhenry
dd8a84bce3
Fix [ bug #833 ] Accounting journals are broken
2013-04-20 13:08:06 +02:00
Maxime Kohlhaas
cf945f0187
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if
...
libreoffice/jodconverter/exec shell right)
2013-04-20 10:44:01 +02:00
Raphaël Doursenaud
f2bd1461b2
Improved reports
...
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
2013-04-20 07:33:10 +02:00
fhenry
62c9366d69
fix debug
2013-04-20 07:21:26 +02:00
fhenry
75194ddb57
Ifo user visibility and maxlength product label regarding db column size
2013-04-20 07:05:31 +02:00
Laurent Destailleur
162ccf68b6
Merge pull request #841 from FHenry/develop
...
fix [ bug #825 ] User first name not visible into users->perms
2013-04-19 17:21:16 -07:00
fhenry
e2d0d0d414
Fix fix as Eldy wish it
2013-04-20 00:10:20 +02:00
Maxime Kohlhaas
bfb05c78cd
Change carrier config into dict instead of dedicated conf page
2013-04-19 20:20:10 +02:00
unknown
8030b39536
fix : undefined variable
2013-04-19 19:45:06 +02:00
Laurent Destailleur
eebbcbec57
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-19 19:18:39 +02:00
Laurent Destailleur
bb3f40a1bf
Qual: Clean code to be able to update combo box when removing a box.
...
Qual: Opensurvey tables
2013-04-19 15:26:53 +02:00
Laurent Destailleur
08ae1d289b
Pgsql compatibility
2013-04-19 15:02:53 +02:00
Laurent Destailleur
570e4391a5
Fix: Box with product out of stocks for pgsql
2013-04-19 14:51:39 +02:00