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
Regis Houssin
5d7b94f661
Fix: the purchase price, manually entered is not taken recovered
2013-04-19 13:30:08 +02:00
Regis Houssin
077698d789
Fix: for avoid missing the customer discount
2013-04-19 12:47:53 +02:00
Laurent Destailleur
df0b0ebf51
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
2013-04-19 09:44:37 +02:00
Laurent Destailleur
ac8868e2d2
Fix: Use correct format for js
2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e
Qual: Work to prepare usage of jquery data plugins.
2013-04-18 19:37:50 +02:00
Regis Houssin
ebb09db710
Fix: for avoid errors
2013-04-18 11:05:31 +02:00
Juanjo Menent
fa4490ef79
Merge pull request #840 from FHenry/develop
...
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481
Qual: No need to use two menu entries for this.
2013-04-17 16:26:14 +02:00
fhenry
4927aae891
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 16:20:01 +02:00
Laurent Destailleur
a5deb8e9d7
Fix: bug into is_erasable function.
...
Conflicts:
test/phpunit/NumberingModulesTest.php
2013-04-16 15:54:36 +02:00
Laurent Destailleur
4fe49b6736
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196
Fix: bug into is_erasable function.
2013-04-16 15:00:41 +02:00
fhenry
cba73b238c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal.php
Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
9659ecba70
Merge pull request #836 from jfefe/extrafields
...
Fix on extrafields date type : do not show current date when field not r...
2013-04-16 02:33:01 -07:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +02:00
Laurent Destailleur
51fe0d9e09
Removed duplicate function
2013-04-15 22:26:03 +02:00
jfefe
610fed6b3c
Fix on extrafields date type : do not show current date when field not required
2013-04-15 18:42:00 +02:00
Laurent Destailleur
37e54b3d80
Qual: Update copyright files.
...
Qual: Removed not used library.
Look: Uniformize css.
2013-04-15 18:00:20 +02:00
Laurent Destailleur
8e1c06f617
Qual: Cleaner menu sources
2013-04-15 15:56:50 +02:00
fhenry
24a6321d45
Fix : Add service date limit transfert from propal to order
2013-04-15 15:55:10 +02:00
Laurent Destailleur
de2ddc02e4
Qual: Another clean of menu management system. Removed all files
...
pre.inc.php
2013-04-15 13:11:29 +02:00
Laurent Destailleur
36c55971b5
Fix: PHPUnit Regression
2013-04-14 23:57:07 +02:00
Laurent Destailleur
67052933ca
Fix: PHPUnit
2013-04-14 23:42:24 +02:00
Laurent Destailleur
a0851ba99f
More complete log.
2013-04-14 18:10:02 +02:00
Laurent Destailleur
e4c4cced70
Look: Optimize for small screen
2013-04-14 16:11:55 +02:00
Laurent Destailleur
a5d996de4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-14 14:45:43 +02:00