Laurent Destailleur
86e827e3f7
Fix: Missing sources
...
Fix: packager
2013-09-12 23:47:36 +02:00
Laurent Destailleur
600db0a147
Merge pull request #1234 from csalvador/develop
...
Bugfix
2013-09-12 12:55:44 -07:00
simnandez
002e248f00
Fix: [ bug #1062 ] Documents lost in propals and contracts validating
2013-09-12 16:55:49 +02:00
simnandez
817569d487
Fix: [ bug #1062 ] Documents lost in propals and contracts validating
2013-09-12 16:54:47 +02:00
Cédric Salvador
b21226f2b7
fixed fatal error
2013-09-12 16:39:18 +02:00
Cédric Salvador
2ec8720629
crlf to lf
2013-09-12 14:24:51 +02:00
Laurent Destailleur
16e2de1d7b
Merge pull request #1228 from csalvador/develop
...
Added a field to group by to avoid error with mysql strict mode
2013-09-12 02:06:31 -07:00
simnandez
b36dc08e00
Remove unnecessary code
2013-09-12 09:59:23 +02:00
Laurent Destailleur
6c47ee22b4
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
.travis.yml
2013-09-11 23:12:47 +02:00
Laurent Destailleur
899c209468
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-11 23:10:54 +02:00
Laurent Destailleur
6f2652f2b6
Fix: Use correct standard
2013-09-11 23:07:47 +02:00
Laurent Destailleur
b8d11b7467
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-11 22:01:02 +02:00
Laurent Destailleur
301187a117
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
COPYRIGHT
dev/initdata/mysqldump_dolibarr_3.3.0.sql
htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7
Fix: Opensource rules violation (sources must be included with lib)
2013-09-11 21:39:33 +02:00
Raphaël Doursenaud
875f9d55c7
Fixed tinyint for PostgreSQL in a more generic way
2013-09-11 17:34:35 +02:00
Raphaël Doursenaud
3c08ca5b71
Fixed SQL install script for PostgreSQL
2013-09-11 17:12:51 +02:00
simnandez
eb44f272e3
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-11 17:10:06 +02:00
simnandez
a0ce8974b5
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-11 16:44:34 +02:00
Raphaël Doursenaud
cbb763ab3f
Fixed installer with DoliDB abstract class
2013-09-11 15:48:25 +02:00
Laurent Destailleur
74f8a19134
Qual: Make code simpler
2013-09-11 15:17:31 +02:00
Laurent Destailleur
4b2ee84ede
Merge pull request #1230 from GPCsolutions/deprecated-5.5
...
Deprecated in PHP 5.5
2013-09-11 06:09:26 -07:00
Raphaël Doursenaud
07b321b6c3
Replaced PHP 5.5 deprecated call in external library
2013-09-11 15:00:35 +02:00
Raphaël Doursenaud
9636e1aafc
Replaced PHP 5.5 deprecated calls
2013-09-11 14:48:02 +02:00
Laurent Destailleur
0bb18cb05c
New: Can use tag {mm} before {yy} even when there is a reset into
...
numbering masks.
Qual: Enhance phpunit tests to include this case.
2013-09-11 14:18:56 +02:00
Laurent Destailleur
50ce834dd0
[ bug #1049 ] agenda isn't save preferences
2013-09-11 11:08:38 +02:00
Laurent Destailleur
21d9aa2fe4
Fix: [ bug #1054 ] Customer Invoice Numbering failure
2013-09-11 11:01:02 +02:00
Laurent Destailleur
eb10093ae8
Fix: Regression detected by phpunit
2013-09-11 10:05:01 +02:00
Laurent Destailleur
92e1536d8f
Fix: checkstyle errors
2013-09-11 09:56:20 +02:00
Laurent Destailleur
e361566eae
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-11 09:40:23 +02:00
Laurent Destailleur
fd17280521
Removed all checkstyle errors
2013-09-11 09:40:00 +02:00
simnandez
418457e945
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-11 09:19:25 +02:00
simnandez
699414cab7
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 18:45:16 +02:00
simnandez
bc0356db1f
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 18:32:03 +02:00
simnandez
c1c423dcac
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 17:49:36 +02:00
simnandez
634f70a74d
New: [ task #1060 ] Register fields localtax(1|2)_type into details
...
tables. Invoices
2013-09-10 17:07:38 +02:00
Cédric Salvador
13e86e9b0d
Added a field to group by to avoid error with mysql strict mode
2013-09-10 16:45:05 +02:00
Laurent Destailleur
f195d59c9c
Try to fix false positive with dolgraph
2013-09-10 16:12:20 +02:00
Laurent Destailleur
21602b34a9
Try to fix false positive with dolgraph
2013-09-10 15:56:40 +02:00
Laurent Destailleur
7d2109f8e8
Try to fix false positive with dolgraph
2013-09-10 15:50:05 +02:00
Laurent Destailleur
e467d63a94
Try to fix false positive
2013-09-10 15:45:36 +02:00
Laurent Destailleur
9314859ead
More log to find bug
2013-09-10 15:21:56 +02:00
Laurent Destailleur
345aa33efd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-10 14:20:15 +02:00
Laurent Destailleur
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Laurent Destailleur
38d3746c11
Merge pull request #1226 from GPCsolutions/dolidb
...
Added an abstract DolibDB class
2013-09-10 03:36:34 -07:00
Raphaël Doursenaud
5426db63ff
Added an abstract DolibDB class
2013-09-10 12:29:55 +02:00
Laurent Destailleur
2db0a56b17
Merge pull request #1225 from jfefe/fix_ws_order
...
Fix : missing lib / bad property name in order webservice
2013-09-10 02:44:22 -07:00
Laurent Destailleur
598f6883a2
Doc comments
2013-09-10 11:39:20 +02:00
jfefe
5abbee02c8
Fix : missing lib / bad property name in order webservice
2013-09-10 11:23:36 +02:00
simnandez
af89a794a0
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:06:15 +02:00
simnandez
43beb38c9b
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:04:36 +02:00
Laurent Destailleur
c147fc6016
Fix: checkstyle
...
Try phpcs into travis
2013-09-10 02:09:55 +02:00
Laurent Destailleur
ad851a6432
Added language fr_NC
2013-09-10 01:44:21 +02:00
Laurent Destailleur
1b526b7aa5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
.travis.yml
htdocs/fourn/facture/index.php
2013-09-09 20:00:12 +02:00
Laurent Destailleur
2b8af33505
Fix: eof
2013-09-09 19:15:34 +02:00
jfefe
13e235ca8a
Fix: permission check in invoice webservice
...
remove comment & indent code
2013-09-09 17:08:22 +02:00
Laurent Destailleur
d22985c5fa
More accurate log file
2013-09-09 12:23:15 +02:00
Cédric Salvador
0c93c6f0b1
format
2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f
indentation
2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34
don't display warehouse selection if there's only one
...
Conflicts:
htdocs/compta/facture.php
htdocs/langs/en_US/stocks.lang
htdocs/langs/fr_FR/stocks.lang
2013-09-09 09:55:51 +02:00
Laurent Destailleur
e2b8ad2035
Fix: not defined value
2013-09-09 03:43:59 +02:00
Laurent Destailleur
414ab39d30
Fix: bug detected with phpunit
2013-09-09 02:37:11 +02:00
Laurent Destailleur
89619cad7b
Fix: Unit test regression
2013-09-08 23:38:40 +02:00
Laurent Destailleur
afe58abdcd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1
Fix: Edit propal line was losing product supplier price id
...
Conflicts:
ChangeLog
2013-09-08 21:51:08 +02:00
Laurent Destailleur
2685c47185
Download transifex changes
2013-09-08 00:52:48 +02:00
Laurent Destailleur
edaeaf3803
Fix: field is not mandatory
2013-09-08 00:23:32 +02:00
Laurent Destailleur
74a50d8d6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30
Fix: navigation of supplier invoices
2013-09-07 19:50:47 +02:00
Laurent Destailleur
082cf0b487
Revert "Avoid silly assignment"
...
This reverts commit fa51e310b8 .
2013-09-07 19:27:35 +02:00
Laurent Destailleur
1c62d2a475
Fix: Ref not visible into page
2013-09-07 19:11:54 +02:00
Laurent Destailleur
3a8784a6de
Qual: Mutualize code
2013-09-07 19:08:08 +02:00
Laurent Destailleur
b7d2811048
Merge pull request #1216 from FHenry/develop
...
Fix bug on category contact
2013-09-06 13:49:39 -07:00
Laurent Destailleur
2d354de549
Merge pull request #1211 from FHenry/3.4
...
Fix: Delete linked element to supplier invoice when deleted (as done for
2013-09-06 13:49:27 -07:00
Laurent Destailleur
8a82b01b22
Merge pull request #1217 from csalvador/replenishment-fix
...
Replenishment fix
2013-09-06 13:48:47 -07:00
Laurent Destailleur
dfce949b06
Merge pull request #1219 from csalvador/hide_purchase_price
...
Hide purchase price
2013-09-06 13:48:04 -07:00
Laurent Destailleur
884965a679
Merge pull request #1218 from GPCsolutions/develop-review
...
Fixed bad copy-paste
2013-09-06 13:47:14 -07:00
Laurent Destailleur
651596e8d5
Fix: missing ;
2013-09-06 13:42:14 +02:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Laurent Destailleur
87a4418baf
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-06 10:50:44 +02:00
Cédric Salvador
4454bc16de
indentation
2013-09-06 10:49:18 +02:00
Laurent Destailleur
9fa6d4ccdf
Fix: Avoid error for free products. Also add hidden otion to enable
...
this. In most cases, we don't want to do this.
2013-09-06 10:40:44 +02:00
Cédric Salvador
d592e776fd
hide purchase price unless the user has the appropriate rights
...
Conflicts:
htdocs/product/liste.php
2013-09-06 10:40:33 +02:00
Raphaël Doursenaud
ae36934746
Fixed bad copy-paste
2013-09-06 10:22:13 +02:00
Cédric Salvador
413d76ce51
fixed error level
2013-09-06 09:56:07 +02:00
Raphaël Doursenaud
1db9cdac28
Fixed pagination
2013-09-06 09:56:07 +02:00
Cédric Salvador
d8e5fbc662
keep the alert filter when changing page
2013-09-06 09:56:06 +02:00
Cédric Salvador
a9ca9c04ef
Fixed request returning nothing when there's no records in llx_product_stock
2013-09-06 09:56:06 +02:00
Cédric Salvador
0a6079934b
alertonly checkbox stays checked
2013-09-06 09:56:06 +02:00
Cédric Salvador
41ad9bdb7f
frenglish is bad
2013-09-06 09:56:06 +02:00
Cédric Salvador
6015a36183
filter on stock alert
2013-09-06 09:56:06 +02:00
Cédric Salvador
bbae47c48f
natural search
2013-09-06 09:56:06 +02:00
Cédric Salvador
b58297a791
fixed warning showing up when searching
2013-09-06 09:56:05 +02:00
Cédric Salvador
6a51f5f87a
don't jump to the product card when there's only one research result
2013-09-06 09:56:05 +02:00
Laurent Destailleur
d7a14a15b3
Fix: Bad link
2013-09-06 09:26:23 +02:00
Laurent Destailleur
f45be6a2a7
Prepare for 3.4.1
...
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/debian/changelog
2013-09-06 01:37:07 +02:00
Laurent Destailleur
38e4b0f9ac
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/watch
2013-09-05 23:57:30 +02:00
Laurent Destailleur
d493dc8513
Merge pull request #1215 from GPCsolutions/develop-review
...
Develop review
2013-09-05 13:51:28 -07:00
Florian Henry
e7520b4bc7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-05 21:03:10 +02:00
Florian Henry
34d4c15d0e
Fix bug on category contact
2013-09-05 21:03:03 +02:00
Raphaël Doursenaud
36a281ce58
CSS fixes
2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
8010389c08
Fixed wrong path in CSS
2013-09-05 20:29:06 +02:00
Raphaël Doursenaud
d39f2d655c
Typo fix: remove unwanted comma
2013-09-05 20:28:24 +02:00
Raphaël Doursenaud
0e8eddb470
Revert "Method should be static"
...
This reverts commit 4ca5bc3797 .
2013-09-05 19:00:00 +02:00
Raphaël Doursenaud
e762042828
Fixed typos
2013-09-05 18:06:51 +02:00
Raphaël Doursenaud
6e64e0e7be
Fixed gd calls for windows bitmap images
2013-09-05 17:56:28 +02:00
Florian Henry
2740cc78b6
Add dol_syslog
...
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
2013-09-05 17:45:30 +02:00
Florian Henry
95ff16f145
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-09-05 17:39:49 +02:00
Juanjo Menent
15bb60c8a1
Merge pull request #1212 from FHenry/develop
...
Add ref supplier into muscadet model
2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
cd684460ff
Removed silly code
2013-09-05 17:30:17 +02:00
Raphaël Doursenaud
7681c60f6b
Silly assignment was a bug
2013-09-05 17:22:51 +02:00
Raphaël Doursenaud
fa51e310b8
Avoid silly assignment
2013-09-05 17:19:30 +02:00
Raphaël Doursenaud
9046d620e1
Avoid using the same var as outer loop
2013-09-05 17:15:06 +02:00
Raphaël Doursenaud
8e6860ac72
Fixed developer intent
2013-09-05 17:01:15 +02:00
Raphaël Doursenaud
4efe215b0c
Qual: removed a bunch of duplicated array keys
2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
465d59ba82
Don't call non static class statically
2013-09-05 16:44:57 +02:00
Raphaël Doursenaud
4ca5bc3797
Method should be static
2013-09-05 16:44:02 +02:00
Raphaël Doursenaud
0c0740cac7
Don't call non static class statically
2013-09-05 16:43:22 +02:00
Raphaël Doursenaud
109cc09e82
Simplified JS
2013-09-05 16:37:23 +02:00
Laurent Destailleur
e40d644085
Fix: Remove warning
2013-09-04 16:49:20 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Laurent Destailleur
af22d38681
Fix: Bad total without tax
2013-09-04 15:07:35 +02:00
Laurent Destailleur
5d27ce0173
Merge pull request #1213 from open-minds/develop
...
Fix owner address of company bank account
2013-09-04 01:48:00 -07:00
Laurent Destailleur
b1c25d91cd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3
Fix: Try a fix of cloning lines->array
2013-09-04 10:45:15 +02:00
aspangaro
91320ef99c
Update translation fr_FR
2013-09-04 05:17:33 +02:00
Laurent Léonard
ec86efaab2
Fix owner address of company bank account
2013-09-03 23:57:36 +02:00
Florian Henry
ddeca06f32
Real ref filter
2013-09-03 21:13:05 +02:00
Florian Henry
d8ddb8b3e7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f
Add ref supplier into muscadet model
2013-09-03 20:07:08 +02:00
Florian Henry
cb86cd403c
Fix: Delete linked element to supplier invoice when deleted (as done for
...
all other object into dolibarr)
2013-09-03 20:01:10 +02:00
Laurent Destailleur
64b44298ae
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 18:19:15 +02:00
Laurent Destailleur
c5020056b3
Revert commit.
...
Bug into update function. Also what was difference of new field ?
2013-09-03 18:18:22 +02:00
simnandez
6ae3603549
Trad: Add missing translations
2013-09-03 18:16:30 +02:00
Laurent Destailleur
23df3d82e5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 18:10:55 +02:00
Laurent Destailleur
3bfaadc054
Work on feature to change rule for vat calculation rounding
2013-09-03 18:08:50 +02:00
Grand Philippe
222eb18bb9
fix :
...
Fatal error: Call to undefined function dol_time_plus_duree()
2013-09-03 17:37:22 +02:00
Juanjo Menent
bcbe4e582c
Merge pull request #1209 from grandoc/develop
...
Add an additional description for the category products
2013-09-03 06:25:39 -07:00
Grand Philippe
9f01aa51a3
fix regression
2013-09-03 15:19:03 +02:00
Grand Philippe
397d0e3b81
Add an additional description for the category products
2013-09-03 15:12:15 +02:00
Juanjo Menent
7293d58002
Merge pull request #1208 from grandoc/develop
...
Add an additional description for the category products
2013-09-03 02:43:30 -07:00
Grand Philippe
6d6f30725b
Add an additional description for the category products
2013-09-03 11:41:33 +02:00
Laurent Destailleur
e40452f3b2
Fix: Bug if modules not enabled
2013-09-03 11:36:28 +02:00
Grand Philippe
dfdc9da781
Add an additional description for the category products
2013-09-03 11:15:19 +02:00
BENKE Charles
bb8f8332f9
Update modProjet.class.php
...
enhance export feature with
left join and projet_task_time data
2013-09-03 11:12:29 +02:00
simnandez
614f376392
Trad: Fix bad descriptor
2013-09-03 09:25:14 +02:00
Laurent Destailleur
b02bf5a2a7
Syn with transifex
2013-09-03 00:42:54 +02:00
Grand Philippe
da384dda18
uniformize
2013-09-02 11:53:07 +02:00
Grand Philippe
4c5d9e8441
fix : activate a model
2013-09-02 10:17:45 +02:00
simnandez
58e2c4e38e
Fix: compatiblity with multicompany module
2013-09-02 10:08:38 +02:00
simnandez
83042459a5
Fix: compatiblity with multicompany module
2013-09-02 10:07:44 +02:00
Laurent Destailleur
cb52af4f47
Qual: Make code more generic
2013-09-02 02:14:16 +02:00
Laurent Destailleur
b150e03b06
Fix: bad merge.
...
Fix: Restore backward compatibility. Add option hideifdisabled for call
that does not need disabled users.
2013-09-02 00:47:30 +02:00
Laurent Destailleur
b95aa1ac7b
Fix: select list on external table
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-09-02 00:41:14 +02:00
Laurent Destailleur
3a4896609a
Fix: Remove debug print
2013-09-02 00:38:13 +02:00
Laurent Destailleur
e6611b6ba1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-02 00:34:55 +02:00
Laurent Destailleur
51cc957b97
Fix: select list on external table
2013-09-02 00:34:41 +02:00
Laurent Destailleur
20b92ca4d7
Merge pull request #1160 from defrance69/patch-10
...
Update index.php
2013-09-01 15:20:57 -07:00
Laurent Destailleur
1ba382d7a6
Merge pull request #1202 from FHenry/develop
...
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Laurent Destailleur
1392f4e623
Merge pull request #1203 from PaulPoulain/966-develop
...
T966-develop : Put the poste of the contact in the list
2013-09-01 14:49:06 -07:00
Laurent Destailleur
8cd1563f58
More test
2013-09-01 20:55:59 +02:00
Laurent Destailleur
0ca6c3f6ad
Fix: Missing class
2013-08-31 16:58:25 +02:00
Laurent Destailleur
4272209832
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-31 12:44:13 +02:00
Laurent Destailleur
a8096c7359
New: Export/import profile include state.
2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5
[ task #1044 ] Add option to enabled thirdparty number into select
...
thirdparty list
2013-08-30 18:18:58 +02:00
Florian Henry
8b9b682eaf
Merge remote-tracking branch 'origin/develop' into develop
2013-08-30 18:11:47 +02:00
Florian Henry
853758a422
REplicate extrafield value
...
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e
All deposit inoice form order
2013-08-30 10:46:05 +02:00
simnandez
2a8aa50163
Fix: Intervention box links to contracts id
...
Conflicts:
htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6
Fix: Intervention box links to contracts id
2013-08-29 12:05:29 +02:00
lalaina rasamoelina
fcd6985196
T966-develop : Put the poste of the contact in the list
...
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
2013-08-29 10:32:28 +02:00
simnandez
a321264a2a
Fix: Localtaxes balance not showing
...
Conflicts:
ChangeLog
2013-08-29 10:03:32 +02:00
simnandez
fa4a9c73c4
Fix: Localtaxes balance not showing
2013-08-29 09:58:07 +02:00
lalaina rasamoelina
3156f8cae0
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-29 09:30:26 +02:00
Florian Henry
42f165af15
Export module : Allow user define "field as field name"
2013-08-28 23:08:12 +02:00
Florian Henry
29396bd51a
Change SQL syntax
2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb
adjust spacing
2013-08-28 16:50:38 +02:00
Florian Henry
650689d294
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-08-28 16:49:22 +02:00
Laurent Destailleur
e741ce9ea2
Merge pull request #1201 from FHenry/3.4
...
Fix: Mailing module : if an email is already in destinaires list all
2013-08-28 07:41:01 -07:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
Laurent Destailleur
cfa7b6ead9
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-08-28 13:13:22 +02:00
Laurent Destailleur
b39046ca7e
Fix: Add missing syslog
2013-08-28 13:05:14 +02:00
lalaina rasamoelina
ca6a973d96
T940-develop: creating a bouton which permit to create an event in the propal,and command .
...
If we create an event in the propal, then the events will be attached in the propal
and if it's for command,it will be attached in the command
2013-08-27 15:51:06 +02:00
Regis Houssin
841961df4e
Fix: wrong function name
2013-08-27 14:53:24 +02:00
Laurent Destailleur
7f549e60f2
Fix: Bad selection of years into graphics
2013-08-27 12:02:33 +02:00
Laurent Destailleur
657c4d6e90
Fix: Fix graph for product distribution.
...
Add limit and add entry other.
2013-08-27 11:54:07 +02:00
simnandez
34fe1fba7f
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Laurent Destailleur
1f6d0ab3ef
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2013-08-27 09:36:54 +02:00
Laurent Destailleur
9cf2d8c556
Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter
...
Update parameter as expected by the function name
2013-08-26 14:12:30 -07:00
Laurent Destailleur
83c3bde1bd
Merge pull request #1197 from grandoc/develop
...
some fix for contract model and clean code
2013-08-26 14:10:08 -07:00
Raphaël Doursenaud
dcc87263d0
Update parameter as expected by the function name
2013-08-26 18:26:11 +02:00
Grand Philippe
ed31c83fbb
some fix for contract model
2013-08-26 15:42:01 +02:00
Grand Philippe
24e6042378
some fix for contract model
2013-08-26 15:32:56 +02:00
Grand Philippe
2591fa95f0
some trad for contract model
2013-08-26 15:07:36 +02:00
Florian Henry
2dce07590c
Fix: If only service module is activated, it's impossible to delete
...
service
2013-08-26 14:39:35 +02:00
Grand Philippe
7a64ad1a26
some fix for contract model and clean code
2013-08-26 14:29:46 +02:00
simnandez
c78b0dbcc6
Trad: Add ca_ES and es_ES boxes translations
2013-08-26 13:00:47 +02:00
Laurent Destailleur
9acc6bedbb
Merge pull request #1196 from FHenry/develop
...
Fix PgSQL upgrade process failed
2013-08-26 03:43:13 -07:00