Laurent Destailleur
4cb671f4db
Qual: Clean deprecated code.
2014-04-28 11:55:08 +02:00
aspangaro
bab54f8264
Type bank & tva
2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872
Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated
2014-04-28 04:53:39 +02:00
aspangaro
66b4139e8f
Merge branch 'upstream/develop'
2014-04-28 04:44:18 +02:00
aspangaro
9ff3dc6189
Fix :: MySql Problem when create a salary payment
2014-04-28 04:43:17 +02:00
Laurent Destailleur
e5012a1670
Fix: Bad parameter type
2014-04-28 04:27:49 +02:00
Laurent Destailleur
d5c781158d
Merge pull request #1555 from aspangaro/develop
...
HRM Area - Typo & presentation
2014-04-28 02:41:36 +02:00
Laurent Destailleur
4a23a8a789
Merge branch 'category_translate' of github.com:aternatik/dolibarr into
...
aternatik-category_translate
Conflicts:
ChangeLog
2014-04-28 02:39:56 +02:00
Laurent Destailleur
c600003807
Merge pull request #1552 from aternatik/ws_prodlang
...
Add multilang support into product webservice
2014-04-28 02:36:11 +02:00
Laurent Destailleur
f749ae6052
Fix: With LDAP we refused empty password because some LDAP are "opened"
...
for anonymous access so connexion is a success.
2014-04-28 02:31:11 +02:00
Laurent Destailleur
7ba2f19106
Update support page with link to local forums.
2014-04-28 02:01:15 +02:00
Laurent Destailleur
e5c5b15ecc
Qual: Start to clean module ECM (Code is to complex). Prepare for
...
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
2014-04-28 01:46:11 +02:00
Laurent Destailleur
8c5bc11def
Qual: Better error message for LDAP connection
2014-04-27 14:16:29 +02:00
aspangaro
e03be4f6ed
HRM Area - Typo & presentation
2014-04-27 04:08:34 +02:00
Laurent Destailleur
8c7ff91341
Fix: Removed html5 warnings
2014-04-27 01:51:50 +02:00
Laurent Destailleur
8beaf30e88
Qual: Removed useless use of js
2014-04-27 01:51:31 +02:00
Laurent Destailleur
ba9dc57912
Fix: Avoid wrapping
2014-04-27 01:49:57 +02:00
Laurent Destailleur
0ab4265456
Fix: Missing translation key.
2014-04-27 01:20:32 +02:00
Laurent Destailleur
5f1e690039
New: Show invoice ref in boxes for supplier invoices.
2014-04-26 23:15:45 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
4fa472518e
Fix: doxygen
2014-04-26 22:23:46 +02:00
Laurent Destailleur
bd8cdd337a
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
2014-04-26 22:17:11 +02:00
Laurent Destailleur
537ada96a8
Fix: [ bug #1354 ] Tasks disapear in same sub-task
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/projet/class/project.class.php
2014-04-26 21:47:15 +02:00
Laurent Destailleur
4ecfa1d6e0
Clean corrupted data for categories
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2014-04-26 21:40:57 +02:00
Laurent Destailleur
af2cf0b66f
Fix: [ bug #1354 ] Tasks disapear in same sub-task
2014-04-26 21:36:58 +02:00
Laurent Destailleur
950c59eb61
Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers.
2014-04-26 17:34:39 +02:00
Laurent Destailleur
6968304641
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
2014-04-26 17:27:59 +02:00
Laurent Destailleur
c54d9d9171
Fix: [ bug #1351 ] VIES verification link broken
2014-04-26 16:27:06 +02:00
Laurent Destailleur
4ade14b841
Qual: Removed code we should not have.
2014-04-26 16:15:35 +02:00
Laurent Destailleur
2bd8da4e70
Missing property
2014-04-25 20:36:13 +02:00
Laurent Destailleur
71ca269c71
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
2014-04-25 20:29:29 +02:00
Laurent Destailleur
9a320cc50f
Removed a function we should not have.
2014-04-25 20:18:26 +02:00
Laurent Destailleur
196cf53dbd
Fix: Pb of return values
2014-04-25 20:11:38 +02:00
Laurent Destailleur
ae23d78c74
Add field nb_holidays and salary.
2014-04-25 20:06:19 +02:00
Laurent Destailleur
b117ea83be
Fix: missing trans
...
Fix: detection of html content
2014-04-25 16:45:14 +02:00
jfefe
dbaddd1fbd
Add translation support into categories arbo
2014-04-25 15:36:37 +02:00
jfefe
098fa7027c
Remove unused note into category translation
2014-04-25 15:36:00 +02:00
jfefe
d256799abf
Work on adding catgory translation
2014-04-25 15:17:12 +02:00
Laurent Destailleur
3a7a15cff8
Trans: text more clear
2014-04-25 15:00:18 +02:00
Laurent Destailleur
298da30200
New: Extrafields can be used as substitution key %EXTRA_XXX% into emails
...
texts for members.
2014-04-25 14:39:34 +02:00
jfefe
b2b8fbb227
Fix : bad call of extrafields into categories
2014-04-25 14:28:22 +02:00
jfefe
afaf5698a5
Fix : bad link to categorie admin page
2014-04-25 14:25:49 +02:00
jfefe
f9e08c23d9
Add multilang support into getProductOrService webservice method
2014-04-25 13:32:31 +02:00
jfefe
181a49c18c
Add multilang support into getProductsForCategory webservice method
2014-04-25 13:31:38 +02:00
jfefe
e6e45862a1
Work into multilang into product webservice
2014-04-25 13:31:38 +02:00
Laurent Destailleur
0b1bfa56e2
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-24 01:26:53 +02:00
Laurent Destailleur
889ed4a49c
Fix: div was opened and not close or the oposite.
2014-04-24 01:26:28 +02:00
Laurent Destailleur
03d73bce9c
Merge pull request #1550 from GPCsolutions/staticanalysis
...
Various fixes to defects found using statical analysis tooling
2014-04-23 21:20:39 +02:00
Laurent Destailleur
078a7f4162
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-04-23 21:19:06 +02:00
Laurent Destailleur
693529c40b
Merge pull request #1549 from atm-maxime/develop
...
Fix : proposal validation was converting third as customer
2014-04-23 21:18:34 +02:00
Laurent Destailleur
6c56302fd2
Merge pull request #1547 from GPCsolutions/jsinjection
...
Qual: Prevent potential JS injection
2014-04-23 21:14:22 +02:00
Laurent Destailleur
5e2c360d38
Merge pull request #1546 from GPCsolutions/linkfix
...
Fix undeclared variable
2014-04-23 21:13:06 +02:00
Laurent Destailleur
8d6e80d016
Merge pull request #1545 from GPCsolutions/dolidb
...
Dolidb
2014-04-23 21:12:43 +02:00
Laurent Destailleur
82d57c20cc
Merge pull request #1542 from FHenry/develop
...
add filter to effectif select
2014-04-23 21:10:07 +02:00
Laurent Destailleur
1f4e6d69a1
Merge pull request #1541 from defrance69/patch-8
...
Update propal.class.php
2014-04-23 21:09:34 +02:00
Raphaël Doursenaud
20842a5c45
Qual: Missing variable declaration
2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
7cdabb7d6c
Qual: Derived missing variable from a known one
2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
ae11a151d7
Qual: Derived missing variable from a known one
2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
152fbbd7f6
Qual: Wrong type in method documentation
2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
11ef3ef34e
Qual: Missing variable declaration
2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
a57b7d4ed2
Qual: Derived missing variable from a known one
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
7852020b3d
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
490b45ea7e
Qual: Wrong type in method documentation
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
e3fa0332f4
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
167457562e
Qual: Wrong variable name
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
8f215205fa
Qual: Wrong type in method documentation
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
79e2bf4737
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
c4569b10d0
Qual: Wrong variable name
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
10a0994241
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
370996d5c4
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
32f5ecfaa3
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
6366a66efd
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
9bb454b242
Qual: Wrong variable name
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
953e196a2c
Qual: Missing variable declaration
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
f357d3c5ab
Qual: Missing global declaration
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
aa1ff28158
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
22263dc2c1
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e738a294e8
Qual: Wrong variable name
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
1d52f6d6c2
Qual: Fixed typo
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e561cc87f7
Qual: Wrong variable name
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2abbc8845f
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
0d92abc037
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2cfe27b434
Qual: Wrong type in method documentation
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
6174099827
Qual: Wrong type in method documentation
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
858d1dc8d0
Qual: Missing variable declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
db82a6f0e6
Qual: Missing global declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
988e7a137e
Qual: Missing global declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
f476bee0c7
Qual: Missing variable declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
20983b4807
Qual: Removed unused variable
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
7497a72b1d
Qual: Removed dead code
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
4f3a28e7ed
Qual: Removed unused variable
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
5d74a5a852
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
70606d04ea
Qual: Missing global declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
e7d9423812
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
126d2522fd
Qual: Missing global declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
aacd657972
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
96e12e75bb
Qual: Missing variable declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
9c5db27a70
Qual: Wrong type in method documentation
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
592b738f96
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
71cd774d04
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
9960e5aa8f
Qual: Removed unused variable
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
1757c9d45e
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0a08f3c6e3
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
12ba751432
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0cb58e0b52
Qual: Wrong variable name
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
8b5b7203d5
Qual: Missing global declaration
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
32ced9a502
Qual: Removed missing variable
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
3a7773081e
Qual: Missing method arguments
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
11125f98be
Qual: Missing global declaration
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
d1f59b73d7
Qual: Wrong variable name
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
b3630cc588
Qual: Missing variable declaration
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
2970ead6f3
Qual: Wrong type in method documentation
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
119e96a8b1
Qual: Missing global declaration
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
f4f4eca841
Qual: Wrong variable name
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
9e839f43e6
Qual: Wrong type in method documentation
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
6788c5b7f8
Qual: Wrong type in method documentation
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
fe05d3f2c4
Qual: Missing global declaration
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
96c0c43404
Qual: Missing global declaration
2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
d717133d62
Qual: Removed dead code
2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
b68fb41d28
Qual: Wrong type in method documentation
2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
1c3c20105e
Qual: Wrong type in method documentation
2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
d66ba0e026
Qual: Wrong type in method documentation
2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
f1f550e551
Qual: Removed missing variable from function call
2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
ca8cf9101c
Qual: Removed missing variable from function call
2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
7a6b3a0827
Qual: Missing variable declaration
2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
036cc7472f
Qual: Removed missing variable from function call
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
1c7011523d
Qual: Missing global declaration
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
6fc9fbd7a6
Qual: Derived missing variable from a known one
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
202344e8fb
Qual: Wrong type in method documentation
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
234a2a0e27
Qual: Removed call to inexistant object
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
82973eb0b7
Qual: Removed missing variable from function call
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
eca27d6711
Qual: Wrong type in method documentation
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
85d1770646
Qual: Removed missing variable from function call
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
652cb77e40
Qual: Removed missing variable from function call
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
229bc890d4
Qual: Moved variable declaration for later usage
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
3830329499
Qual: Removed missing variable
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
996704d258
Qual: Removed missing variable from function call
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
75eb98033f
Qual: Fixed typo
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
aad4359786
Qual: Removed missing variable from function call
2014-04-23 18:23:59 +02:00
Raphaël Doursenaud
e5975d52a9
Qual: Wrong type in method documentation
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
43606c8ac4
Qual: Fixed typo
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
b6312d1efd
Qual: Missing method argument
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
af7d2d0b50
Qual: Wrong type in method documentation
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
63166f3f5c
Qual: Wrong type in method documentation
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
aa5d0b37b7
Qual: Wrong type in method documentation
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
1bb99da8db
Qual: Wrong type in method documentation
2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
0fa803977e
Qual: Removed call to inexistant object
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
749973f1b6
Qual: Missing variable declaration
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
32ad4461b8
Qual: Missing method argument
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0ca5a46345
Qual: Bad copy/paste
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
7039fd3892
Qual: Missing class property declaration
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0be3d3bd2f
Qual: Missing global declaration
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
9d7fc43951
Qual: Wrong type in method documentation
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
cd774c0dcd
Qual: Missing global declaration
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
e3385119a4
Qual: Missing argument
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
70cf592270
Qual: Wrong type in method documentation
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
2938ec06b2
Qual: Fixed typo
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
70c9dda964
Qual: Missing global declaration
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
a22ead5e97
Qual: Wrong type in method documentation
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
b522d51d49
Qual: Missing global declaration
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
258c92ab1c
Qual: Avoid wrong declaration
2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
3eabffbc7c
Qual: Missing global declaration
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
d57b4192b6
Qual: Wrong variable name
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
670e861d7b
Qual: Missing global declaration
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
db91684193
Qual: Wrong type in method documentation
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
6cfcdbfe56
Qual: Wrong type in method documentation
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
84c9a390eb
Qual: Mistyped class property
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
7cf553a636
Qual: Missing variable declaration
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
c8b1c3b57d
Qual: Wrong type in method documentation
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
284057d447
Qual: Wrong variable name
2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
4bf426c816
Qual: Undeclared variable replacement
2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
39c064cb74
Qual: Removed useless assignment from void method
2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
83dd3a532b
Qual: Better type check
2014-04-23 18:23:50 +02:00
Maxime Kohlhaas
d21ea0fe19
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-04-23 17:51:22 +02:00
Maxime Kohlhaas
b9865b9ccc
Fix : proposal validation was converting third as customer
2014-04-23 17:50:47 +02:00
Raphaël Doursenaud
79fe0a1658
Qual: Prevent potential JS injection
2014-04-23 15:20:45 +02:00
Alexis Algoud
34948ef2d6
Add somes dol_escape_htmltag on product cards inputs
2014-04-23 14:53:23 +02:00
Laurent Destailleur
9cadd882d2
Hide a column that is always 0.
2014-04-23 13:51:02 +02:00
Laurent Destailleur
01655d1757
New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send
...
invoice
by email whatever is its status.
2014-04-23 13:14:55 +02:00
Laurent Destailleur
002e64d514
Add table for email templates.
...
Removed deprecated table llx_domain.
2014-04-23 13:10:08 +02:00
Laurent Destailleur
caf6712286
Add message on disconnect button when using an authentication mode where
...
disconnect has no sense.
2014-04-23 12:29:41 +02:00
Laurent Destailleur
c1e349d110
Experiment hidden option MAIN_MENU_INVERT
2014-04-23 12:22:01 +02:00
Raphaël Doursenaud
98120862f7
Qual: Moved duplicate method to base method
2014-04-23 12:15:18 +02:00
Laurent Destailleur
459e5f7472
Clean corrupted data for categories
2014-04-23 11:25:05 +02:00
Raphaël Doursenaud
e62edc0a72
Fix undeclared variable
2014-04-23 11:19:34 +02:00
Raphaël Doursenaud
16ede7c52c
Qual: Moved duplicate methods to base method
2014-04-23 11:12:06 +02:00
Raphaël Doursenaud
5cbb1dd96d
Qual: Removed useless method
...
The method is already in the DoliDB base class
2014-04-23 11:07:00 +02:00
Laurent Destailleur
0058bea8e0
Fix typo
2014-04-23 10:22:03 +02:00
Laurent Destailleur
5c653b3a34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-04-22 23:52:41 +02:00
Laurent Destailleur
2b191b6ef8
Uniformization and simplification of code.
2014-04-22 23:49:33 +02:00
Juanjo Menent
f97d162087
Merge pull request #1543 from GPCsolutions/taskautoevents
...
Automatic events for project tasks
2014-04-22 18:10:57 +02:00
Raphaël Doursenaud
d95b5e4a39
Fixed typo
2014-04-22 16:43:19 +02:00
Raphaël Doursenaud
e6c0321fb6
Automatic events for project tasks
2014-04-22 15:30:10 +02:00
Florian HENRY
ff597a899f
add filter to effectif select
2014-04-22 11:20:19 +02:00
Juanjo Menent
d527c4cf73
Fix: Price min of composition is not supplier price min by quantity
2014-04-22 09:57:43 +02:00
Laurent Destailleur
0a8ab84b1d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-04-22 00:04:50 +02:00
Laurent Destailleur
76b5659d4c
Optimize for small screen
2014-04-22 00:04:31 +02:00
BENKE Charles
ad9efb3961
Update propal.class.php
...
it's this->lines who used on create propal function not this->products
2014-04-21 15:40:08 +02:00
philippe
8564691896
Fix some misspelling
2014-04-21 09:46:03 +02:00
BENKE Charles
f05643116a
Update index.php
2014-04-20 14:22:27 +02:00
BENKE Charles
758b732391
Update index.php
...
add piechart on society categories
2014-04-20 12:04:42 +02:00
Laurent Destailleur
b1fd8cf503
Merge pull request #1537 from grandoc/3.5
...
style enhancement
2014-04-20 00:13:50 +02:00
Laurent Destailleur
2b7c2a9040
Merge pull request #1535 from fxw/patch-1
...
Update server_thirdparty.php
2014-04-20 00:01:48 +02:00
Laurent Destailleur
825ae377b0
Merge pull request #1534 from squarou/develop
...
Add 2 lang variables for new tab in adherent
2014-04-19 23:59:24 +02:00
Laurent Destailleur
1c21dbc9e7
Merge pull request #1533 from FHenry/develop
...
Add filter date and total line on bank writing list page
2014-04-19 23:58:48 +02:00
BENKE Charles
c55e51d825
Update project.class.php
2014-04-19 14:59:42 +02:00
BENKE Charles
ebab7a0b62
Update element.php
2014-04-19 13:06:11 +02:00
BENKE Charles
cebbf1607c
Update element.php
2014-04-19 13:00:42 +02:00
BENKE Charles
09d231ad0a
Update project.class.php
2014-04-19 12:36:15 +02:00
BENKE Charles
0b78a04756
Update doc_generic_project_odt.modules.php
2014-04-19 12:32:01 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
ee3592c976
Fix: invert label for accountancy_code_sell
2014-04-18 11:21:15 +02:00
Laurent Destailleur
229e5211c5
Sync from transifex
2014-04-18 11:04:12 +02:00
philippe
2ffe4f589e
style enhancement
2014-04-18 10:54:21 +02:00
Laurent Destailleur
61f0d67da0
Avoid too long filenames
2014-04-16 23:00:30 +02:00
fxw
f86d49c1ac
Update server_thirdparty.php
...
For the method getListOfThirdParties, return all the extrafieldsOptions of the thirdParty Object
2014-04-16 16:33:36 +02:00
Laurent Destailleur
ce34c01b9e
New: On page to enter supplier prices, if there is no supplier, add
...
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
2014-04-16 00:06:16 +02:00
Benjamin
c87515d3a1
Add 2 lang variables for new tab in adherent
...
Added MembersStatisticsByRegion and MembersByRegion
2014-04-14 11:18:14 +02:00
Florian Henry
0d1697589e
syntax
2014-04-13 20:39:40 +02:00
Florian Henry
7d84c573ab
syntax travis ruleset.xml
2014-04-13 18:57:35 +02:00
Florian Henry
57e4453ea2
Add filter date and total line on bank writing list page
2014-04-13 18:26:21 +02:00
Laurent Destailleur
38a0596594
Merge branch 'develop' of https://github.com/aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
htdocs/core/lib/bank.lib.php
2014-04-13 02:11:54 +02:00
Laurent Destailleur
9fb029890c
Doxygen
2014-04-13 02:08:57 +02:00
Laurent Destailleur
87f7771af2
Merge pull request #1532 from defrance69/patch-5
...
Update product.class.php
2014-04-13 02:06:04 +02:00
Laurent Destailleur
0bda82e707
Merge pull request #1524 from FHenry/develop
...
Fix choix date in survey
2014-04-13 02:04:34 +02:00
Laurent Destailleur
5d30220bf1
Merge pull request #1530 from squarou/develop
...
Add region tab for stats in adhrent
2014-04-13 02:04:02 +02:00
Laurent Destailleur
55c2659952
Fix: sql syntax error
2014-04-13 02:02:26 +02:00
Laurent Destailleur
31fa6c5b2b
Merge branch 'develop' of https://github.com/guerrierk/dolibarr into
...
guerrierk-develop
Conflicts:
htdocs/commande/fiche.php
2014-04-13 01:59:46 +02:00
BENKE Charles
32090eeeb5
Update product.class.php
...
init the stock_warehouse Array during fetch instead we omit to load the stock (wrong value stay inside)
2014-04-12 11:41:32 +02:00
aspangaro
79d8ce9d1d
Add tabs in bank card
2014-04-12 10:00:28 +02:00
aspangaro
bae2fe0921
Merge branch 'upstream/develop'
2014-04-12 09:51:19 +02:00
Laurent Destailleur
81ff0a8643
Fix: Missing initialized value
2014-04-12 01:45:18 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
918de2d0a1
Fix: Payment detail are not visible.
2014-04-11 19:20:11 +02:00
Laurent Destailleur
5843668dbe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-04-11 19:02:59 +02:00
Laurent Destailleur
417a1232ef
Uniformize usage of function price
2014-04-11 18:00:58 +02:00
Juanjo Menent
f458c384d7
Fix: Can not make withdrawals
...
Conflicts:
ChangeLog
2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232
Fix: Can not make withdrawals
2014-04-11 12:07:01 +02:00
squarou
a0b05581f9
Added region tab
2014-04-10 22:15:56 +02:00
squarou
247b14afac
Add region stats and tab
...
Added ($mode == 'memberbystate')
2014-04-10 22:13:59 +02:00
Laurent Destailleur
55599f9455
Fix: MAIN_AUTOFILL_DATE was broken in some cases.
2014-04-10 19:47:52 +02:00
Laurent Destailleur
7fcf57ca5a
Fix: SQL request for export. Extra field missing.
2014-04-10 18:36:34 +02:00
Laurent Destailleur
4be113b2e8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-04-10 17:55:14 +02:00
Laurent Destailleur
30731e6c91
Fix: Must use $this
2014-04-10 17:51:42 +02:00
GUERRIER Kevin
3d725f37cb
Adding Bank head completion from other modules
2014-04-10 15:23:58 +02:00
GUERRIER Kevin
6471cd43c1
Bugfix minute saved into second for commande line
2014-04-10 11:44:33 +02:00
GUERRIER Kevin
c2fbd6ae10
Bugfix Hour & Minute not saved into commande line
2014-04-10 10:31:41 +02:00
Florian Henry
0e6161628c
Fix choix_date wizard
2014-04-09 17:41:44 +02:00
Florian Henry
62b856527f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-04-09 17:30:23 +02:00
Laurent Destailleur
5d4b861156
Fix: Try/catch
...
Conflicts:
htdocs/core/class/conf.class.php
2014-04-09 17:09:38 +02:00
Laurent Destailleur
b586b74c79
Fix: Try/catch
2014-04-09 17:07:27 +02:00
Laurent Destailleur
13929bc46f
New: showrefnav can be used with tables without prefix.
2014-04-09 13:19:31 +02:00
Laurent Destailleur
351ab9788b
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-09 01:38:54 +02:00
Laurent Destailleur
e061c442a6
Fix: hour:min not saved
2014-04-09 01:18:42 +02:00
Laurent Destailleur
6f40825270
Merge pull request #1527 from grandoc/3.5
...
translation and cleaning
2014-04-09 00:31:57 +02:00
Laurent Destailleur
13659b1528
Fix: [ bug #1334 ] filter lost when sorting into list of memebers.
2014-04-09 00:12:07 +02:00
Laurent Destailleur
60b37dffe1
Fix: [ bug #1323 ] generation of odt files for tasks.
2014-04-09 00:07:32 +02:00
Laurent Destailleur
4e619c42fa
Fix: [ bug #1340 ] Erreur de langage dans les projets
2014-04-08 23:56:10 +02:00
Laurent Destailleur
e0e64af18c
Fix: Hierarchical user not saved.
2014-04-08 23:51:50 +02:00
Laurent Destailleur
30dae3def2
Doc
2014-04-08 23:28:26 +02:00
Grand Philippe
9a056ab497
anglicizing
2014-04-08 14:05:10 +02:00
Laurent Destailleur
ab3bbf8e0b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
2014-04-07 13:15:26 +02:00
Grand Philippe
fe49f55a48
fix from forum
2014-04-07 11:01:11 +02:00
Grand Philippe
f25ddfbc9c
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2014-04-07 10:03:01 +02:00
Grand Philippe
42b6628b76
translation and cleaning
2014-04-07 09:54:24 +02:00
Laurent Destailleur
a96f762f40
Sync from transifex.
2014-04-07 09:23:50 +02:00
Laurent Destailleur
2b38ec3912
Merge pull request #1526 from defrance69/patch-4
...
Update fournisseur.commande.class.php
2014-04-06 23:45:07 +02:00
Laurent Destailleur
26fa5c0857
Merge pull request #1525 from grandoc/debug
...
anglicized
2014-04-06 23:44:47 +02:00
Laurent Destailleur
5eeb6b8445
Fix: Use "Space" instead of " " when we need space as Thousand
...
Separator.
2014-04-06 23:43:32 +02:00
Laurent Destailleur
6a916a4ce9
Add sq_AL (albanian) language
2014-04-06 23:29:07 +02:00
Laurent Destailleur
3bc63c43dc
Fix: [ bug #1322 ] notification d'erreur en insérant ou supprimer un
...
tiers dans une catégorie
2014-04-06 21:25:26 +02:00
BENKE Charles
def7d1d2c8
Update fournisseur.commande.class.php
...
$id not defined but used
2014-04-06 21:21:08 +02:00
Laurent Destailleur
41a2ce1a74
Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales
...
Conflicts:
htdocs/comm/propal.php
2014-04-06 21:21:08 +02:00
Laurent Destailleur
1c21c00fb6
New: Can use "Space" as value for SeparatorThousand into language files
2014-04-06 21:18:21 +02:00
Laurent Destailleur
a2531872cb
Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales
2014-04-06 21:17:35 +02:00
Laurent Destailleur
5aee7131af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-04-06 20:47:29 +02:00
Laurent Destailleur
18f4eabbdf
Update conf template
2014-04-06 19:09:10 +02:00
philippe
8dc23025ed
anglicized
2014-04-06 16:06:54 +02:00
Grand Philippe
3734c4de0b
Merge branch 'develop' into debug
2014-04-06 15:59:03 +02:00
Laurent Destailleur
b77e068a72
New: More information into email confirm for paybox payment.
2014-04-06 15:01:45 +02:00
Laurent Destailleur
2be6b2ecf7
Fix: var not initialized
2014-04-06 14:53:42 +02:00
Laurent Destailleur
6cb39ea3dc
Fix: Missing message keys
2014-04-06 14:49:04 +02:00
Laurent Destailleur
d595b96c8e
New: Paypal return for subscription show more information and direct
...
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
2014-04-06 14:22:08 +02:00
philippe
43c85cc446
anglicized
2014-04-05 17:14:57 +02:00
Laurent Destailleur
c57c3aef84
Fix: Missing return
2014-04-05 16:28:09 +02:00
Laurent Destailleur
688ce704ec
Fix: Doxygen
2014-04-05 15:14:19 +02:00
Laurent Destailleur
da0aebb2e9
Fix: Can't add user
2014-04-05 12:40:24 +02:00
Laurent Destailleur
c7c640f925
Fix: Can't add user
2014-04-05 12:38:59 +02:00
Laurent Destailleur
d2b1b1a86c
Merge branch 'actiontriggers' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers
Conflicts:
htdocs/langs/de_DE/other.lang
2014-04-04 23:47:36 +02:00
Florian Henry
090fd4811c
Fix choix date in survey
2014-04-04 11:31:39 +02:00
Laurent Destailleur
63729ab508
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-02 19:35:04 +02:00
Laurent Destailleur
ebb9016ad5
Fix: missing 'ifone' into param
2014-04-02 19:34:42 +02:00
Laurent Destailleur
925a58028a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-04-02 18:46:23 +02:00
Laurent Destailleur
262efb997f
Fix: paddingrightonly must use $right and $left to be compatible with
...
LTR languages.
2014-04-02 18:45:59 +02:00
Raphaël Doursenaud
6d7728d9bf
Regenerate document on supplier orders steps
2014-04-02 15:37:19 +02:00
Laurent Destailleur
0e23892c71
More consistency trigger name
2014-04-02 15:05:03 +02:00
Laurent Destailleur
637b47cd08
Merge pull request #1522 from GPCsolutions/triggernames
...
Qual: keep trigger naming consistent
2014-04-02 15:02:42 +02:00
Laurent Destailleur
d5448f9ca4
Merge pull request #1521 from FHenry/3.5
...
Extrafield select form table do not display selected value on edit mode
2014-04-02 14:57:00 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
cf8ff97855
Fix: Install of odt templates for project and tasks failed.
2014-04-02 13:17:20 +02:00
Laurent Destailleur
3a2caa6e64
New: Can filter on status for supplier order.
2014-04-02 12:48:34 +02:00
Raphaël Doursenaud
3b9696351e
Qual: keep trigger naming consistent
2014-04-02 12:22:38 +02:00
Laurent Destailleur
918fe5dbb5
Fix: [ bug #1318 ] Problem with enter key when adding an existing
...
product to a customer invoice
2014-04-02 11:58:59 +02:00
Laurent Destailleur
f3bbf54447
Fix: [ bug #1307 ] Quotes get removed from several inputs
2014-04-02 11:52:09 +02:00
Laurent Destailleur
7ac193bb80
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Laurent Destailleur
3f99d9c866
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-04-02 11:36:34 +02:00
Florian Henry
a2a46f9300
Extrafield select form table do not display selected value on edit mode
2014-04-02 11:34:15 +02:00
Laurent Destailleur
46e46507ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/action/index.php
htdocs/compta/bank/class/account.class.php
htdocs/compta/bank/index.php
2014-04-02 11:33:47 +02:00
Cedric
a4797a0e4a
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-02 11:25:17 +02:00
Laurent Destailleur
663a3bd45c
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-04-02 11:21:11 +02:00
Laurent Destailleur
c421613da9
Merge pull request #1520 from KreizIT/fix_1317
...
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-02 11:20:47 +02:00
Laurent Destailleur
efcd822c27
Merge pull request #1517 from defrance69/patch-3
...
Update propal.class.php
2014-04-02 11:19:42 +02:00
Laurent Destailleur
487a341a91
Merge pull request #1518 from altairis-fr/develop
...
add trigger CREATE_BUYPRICE
2014-04-02 11:16:21 +02:00
Laurent Destailleur
6806a87ebb
Missing tms update
2014-04-02 11:02:18 +02:00
Laurent Destailleur
48c77d2ceb
Fix: [ bug #1312 ] Call to undefined function _()
2014-04-02 10:48:20 +02:00
Laurent Destailleur
6dab09e07a
Fix: Bad dialog position
2014-04-02 00:04:13 +02:00
Laurent Destailleur
f891e1ac42
Fix: use currency into price function
2014-04-02 00:01:06 +02:00
Cedric
df5a009aa2
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-01 16:21:20 +02:00
Christophe Battarel
fff9bc1b00
fix bad attribute name
2014-04-01 11:14:54 +02:00
Christophe Battarel
ea74c4738e
add trigger CREATE_BUYPRICE
2014-04-01 10:23:57 +02:00
Laurent Destailleur
d2cb5e8d2d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-31 22:56:47 +02:00
Laurent Destailleur
897a9b7446
Sync from transifex.
2014-03-31 19:01:28 +02:00
Raphaël Doursenaud
ab623e3ff1
Fixed typo
2014-03-31 14:21:23 +02:00
Laurent Destailleur
56c7d14b9a
We do not force disabling of ckeditor for phones. We let ckeditor
...
decide (currently ckeditor is disabled with android).
2014-03-31 13:25:40 +02:00
Laurent Destailleur
c81406c7f3
Fix: CI
2014-03-31 02:41:15 +02:00
BENKE Charles
f1d9cebb93
Update propal.class.php
...
refactoring LibStatut function (small is better)
2014-03-31 02:38:07 +02:00
Laurent Destailleur
1fad693867
Fix: Removed useless strtolower
2014-03-31 02:25:35 +02:00
Laurent Destailleur
76259a633c
Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have
...
to do it everywhere at different places. Value is now 0 or 1.
2014-03-31 02:16:49 +02:00
Laurent Destailleur
39f48f25db
Fix: Trip and expenses were moved into menu hrm
2014-03-31 01:48:50 +02:00
Laurent Destailleur
d48cbeb720
Fix: W3C
2014-03-31 01:45:48 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
ed49f88446
Fix: deleting files into backup system tools.
...
Fix: Dump using php not not include lock on tables that are deleted.
2014-03-31 00:19:31 +02:00
Marcos García de La Fuente
e6bd3921f1
Fixed a problem with bank accounts sharing across entities
2014-03-30 23:00:35 +02:00
Laurent Destailleur
3d8fb60f94
Start to implement sepa format. Need serious tests.
2014-03-30 20:22:54 +02:00
Laurent Destailleur
2396382ccb
Fix: Syntax error
2014-03-30 18:25:20 +02:00
Laurent Destailleur
95793a5475
Fix: fields into group by of sql requests for module margins must be
...
same than fields into select.
2014-03-30 16:08:30 +02:00
Laurent Destailleur
c506e59d8c
Look: Minor fix to not have calendar picto to glue to input
2014-03-30 15:58:41 +02:00
aspangaro
6e0788c8c1
Merge branch 'upstream/develop'
2014-03-30 08:07:07 +02:00
Laurent Destailleur
81306ff1d0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-29 17:38:29 +01:00
Laurent Destailleur
a5c2b78565
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-29 17:38:06 +01:00
Laurent Destailleur
88a4af394c
Removed dead or useless code.
2014-03-29 14:12:01 +01:00
aspangaro
52cd8792b7
Merge branch 'upstream/develop'
2014-03-29 06:50:34 +01:00
Laurent Destailleur
205c0ac62d
Fix: invert logic. Show child options when parent option is
...
selected instead of selected parent when a child is selected.
2014-03-29 05:18:24 +01:00
Laurent Destailleur
0ca250c6d9
Minor css fixes.
2014-03-29 05:02:02 +01:00
Laurent Destailleur
61f649e1ae
Fix: When select_date is called with '' as preselected date,
...
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
2014-03-29 04:26:44 +01:00
Juanjo Menent
a1fb21114b
New: Add some hooks for financial reports
2014-03-28 18:31:43 +01:00
Juanjo Menent
638e90eb67
Fix: Margin tabs bad data show
2014-03-28 18:23:28 +01:00
Juanjo Menent
acb752c5f2
Fix: Margin tabs bad data show
2014-03-28 18:22:44 +01:00
aspangaro
e0dc01fe85
Merge branch 'upstream/develop'
2014-03-28 12:37:42 +01:00
Laurent Destailleur
d629c55e11
Merge pull request #1514 from KreizIT/batchfix
...
Batch Fix
2014-03-27 16:08:44 +01:00
Laurent Destailleur
f027482b51
Merge pull request #1513 from KreizIT/fixtablestruct
...
Fix installation script link to Task 1074 (missing new field)
2014-03-27 16:06:51 +01:00
Laurent Destailleur
832ebb1cfe
Merge pull request #1512 from atm-alexis/3.5
...
fix can't add line with product in supplier order
2014-03-27 16:05:38 +01:00
Laurent Destailleur
4815825501
Merge pull request #1511 from defrance69/patch-2
...
Update box_ficheinter.php
2014-03-27 16:01:57 +01:00
Laurent Destailleur
1affc38d58
Merge pull request #1509 from defrance69/patch-1
...
Update mouvement.php
2014-03-27 15:59:39 +01:00
Laurent Destailleur
f282ffc549
Merge pull request #1508 from KreizIT/3.5
...
FIX :[bug #1309 ]
2014-03-27 15:58:13 +01:00
Laurent Destailleur
c2b7e40aa1
Merge pull request #1507 from GPCsolutions/3.5-taskswithtime
...
Project: make tasks accept a time
2014-03-27 15:56:26 +01:00
Laurent Destailleur
807cffbc7e
Merge pull request #1505 from open-minds/patch-1
...
Fix thousands separator in french (Belgium) language file
2014-03-27 15:46:30 +01:00
Raphaël Doursenaud
771f205d2a
Langs: added translation string for action triggers that were missing
2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
5acfb5adc7
Langs: removed duplicate key
2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
e07e86b824
Deduplicated lines of the reference language files
...
Used the new deduplicatefilelinesrecursively.sh script
2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
cd7a378eb0
Action triggers/Langs: fixed a bad translation key
2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
0d7a76d8db
3.6 migration script: fixed invalid comments
2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
ee71e42b34
Action triggers: added missing triggers to 3.6 migration script
...
These are the same changes than commit 3afb3a874d9d1533947651de9db28c9207278908 but for the
migration script
2014-03-27 12:03:19 +01:00
Raphaël Doursenaud
8d6084db39
Automatic agenda triggers: uncomment useful syslog
...
The syslog was commented but is useful to spot unimplemented handlers that were nonetheless
enabled in the administration interface.
Also made it issue a warning level message.
2014-03-27 12:02:16 +01:00
Raphaël Doursenaud
c9c75a1c08
Action triggers: Added copyright
...
Reindented the whole block because it was out.
2014-03-27 12:02:15 +01:00
Raphaël Doursenaud
704699f9a1
Action triggers: added missing triggers to the data dictionnary
...
These triggers were programmed in
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
but were nowhere to be found in the interface because they didn't hit the database.
2014-03-27 12:02:15 +01:00
Laurent Destailleur
4d4512fadd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-26 22:14:14 +01:00
Laurent Destailleur
9e771269c4
Qual: clean code
2014-03-26 20:46:17 +01:00
KreizIT
fcb588f424
-Fix error when shipping a batch enabled product without stock
...
-Fix typo
2014-03-26 17:18:02 +01:00
KreizIT
5c837583c3
Fix installation script link to Task 1074 (missing new field)
2014-03-26 16:58:43 +01:00
Laurent Destailleur
62a990d6cc
Fix: ajax_combobox function must be included before called.
...
New: Feature of module survey are now localized into top menu "Tools".
2014-03-26 16:02:22 +01:00
Laurent Destailleur
c45f509984
Qual: Uniformizing payments
2014-03-26 15:41:09 +01:00
Alexis Algoud
f97c8feb54
fix can't add line with product in supplier order
2014-03-26 11:28:41 +01:00
BENKE Charles
a3a6b6dff6
Update box_ficheinter.php
...
External user show only is own intervention
2014-03-26 10:57:07 +01:00
Florian Henry
f93df7f3da
remove debug string
2014-03-26 10:09:29 +01:00
Florian Henry
3d12979b3f
remove debug string
2014-03-26 09:53:48 +01:00
Laurent Destailleur
59042a30e1
Fix and uniformize code for payment of salaries.
2014-03-25 21:35:52 +01:00
Laurent Destailleur
4828d1e89a
New: Uniformize visible information on payment lists.
2014-03-25 20:24:51 +01:00
Laurent Destailleur
a5e8063cfd
Fix: Bad management error
2014-03-25 20:09:30 +01:00
Laurent Destailleur
68b54f5cac
New: Add hidden option PRODUCT_DISABLE_CUSTOM_INFO to disable custom
...
info management (used for export activity only)
2014-03-25 19:52:04 +01:00
BENKE Charles
680ce297c5
Update mouvement.php
...
sometime $year not filled then made "bug" the search
propose to fill with current year in this case
2014-03-25 15:41:20 +01:00
Cedric
57cf384617
Keep value on validtions failure
2014-03-25 13:05:29 +01:00
Cedric
e16385b496
FIX :[bug #1309 ]
2014-03-25 11:48:44 +01:00
Raphaël Doursenaud
7d0853d9e5
Removed debug code
2014-03-25 11:36:22 +01:00
Raphaël Doursenaud
d9cb1da4d5
Project: make tasks accept a time
2014-03-24 15:26:36 +01:00
Florian Henry
bb07d7f814
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-24 13:25:35 +01:00
Laurent Destailleur
f115501ddf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-24 00:16:47 +01:00
Laurent Destailleur
3f78fe8c93
Fix: Avoid to get duplicate field
2014-03-23 21:01:05 +01:00
Laurent Destailleur
6039c81845
Fix: copy to clipboard does not work with jmobile
...
Fix: Bad translation
2014-03-23 20:56:41 +01:00
Laurent Destailleur
57bd043f59
Fix: Missing lang loading
2014-03-23 20:30:54 +01:00
Laurent Destailleur
466de67b5b
Fix: Solve pb of too many embedded tables
2014-03-23 20:18:07 +01:00
aspangaro
bc48ddd3fc
Présentation
2014-03-23 16:33:05 +01:00
aspangaro
81c9446d11
Merge branch 'upstream/develop'
2014-03-23 14:53:31 +01:00
Laurent Léonard
1663a7a6fa
Fix thousands separator in french (Belgium) language file
2014-03-23 14:46:09 +01:00
Marcos García de La Fuente
09e02f807f
Even better improvement
2014-03-22 19:01:19 +01:00
Marcos García de La Fuente
e2f51d0df2
Removed duplicate line
2014-03-22 19:00:37 +01:00
Marcos García de La Fuente
c8c77dbdcf
Fix: Agenda and Banks module were not working with multicompany module
2014-03-22 18:59:48 +01:00
Juanjo Menent
d98a5d4c6f
Fix: [ bug #1306 ] Fatal error when adding an external calendar
2014-03-22 13:01:38 +01:00
Juanjo Menent
e0b4bd9b0d
Fix: [ bug #1306 ] Fatal error when adding an external calendar
2014-03-22 13:00:23 +01:00
Juanjo Menent
ff977f2883
Merge pull request #1501 from FHenry/develop
...
Add ref supplier as column and clear variables in double
2014-03-22 10:31:16 +01:00
Juanjo Menent
334455f8dd
Update es_ES from transifex
2014-03-22 10:28:24 +01:00
Juanjo Menent
79ab420997
Update es_ES from transifex
2014-03-22 09:41:14 +01:00
aspangaro
7e1035171c
Merge branch 'upstream/develop'
2014-03-22 05:55:14 +01:00
Laurent Destailleur
a1e778c146
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-21 21:12:02 +01:00
Laurent Destailleur
1061a650d2
Fix: duplicate info
2014-03-21 21:11:51 +01:00
Laurent Destailleur
29534b4ef5
Removed not used keys
2014-03-21 18:51:39 +01:00
Laurent Destailleur
4bd6f11112
Backport fix to solve warning problems.
2014-03-21 18:35:50 +01:00
Laurent Destailleur
ed7ffebea4
Code comment
2014-03-21 18:32:18 +01:00
Laurent Destailleur
24dbfbba60
Qual: Still working on cleaning code for timezone management.
2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0
Fix: Use correct vat rate into text cases.
...
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
2014-03-21 16:22:41 +01:00
Florian Henry
c8c4a10a06
Fix restrictedearea bug
2014-03-21 16:18:17 +01:00
Florian Henry
cf9b194008
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-21 15:08:30 +01:00
Laurent Destailleur
b2f6498236
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e
Qual: Start to clean old code.
2014-03-21 15:02:27 +01:00
Florian Henry
f0882eca2d
Add ref supplier as column and clear varialbes in double
2014-03-21 15:01:40 +01:00
Florian Henry
10fda1956f
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-21 14:41:18 +01:00
Laurent Destailleur
a884673637
Fix: A better to fix to manage automatic creation of code for import.
2014-03-21 13:29:13 +01:00
Laurent Destailleur
c1411e65b7
Fix: Try to add code to provide easy way to fix warning on timezone not
...
defined.
2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248
Try to remove warning
2014-03-21 09:49:10 +01:00
aspangaro
07d6464720
Trips & expenses move into hrm area
2014-03-20 06:38:07 +01:00
Laurent Destailleur
63bb09fbdf
Fix: Removed duplicate translation
2014-03-20 00:21:52 +01:00
Laurent Destailleur
a9aaac8e15
Fix: Date was lost if error during submit.
2014-03-20 00:05:20 +01:00
Laurent Destailleur
4bf822225e
Look: info admin picto now use the info picto (the star were confused
...
with the mandatory "star").
2014-03-19 23:50:10 +01:00
Laurent Destailleur
68396e023c
New: When creating an invoice all types are visible (even if for the
...
moment we just show an help text to explain how to use type credit note
and deposit).
2014-03-19 23:49:07 +01:00
Laurent Destailleur
caf1eba4e2
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
2014-03-19 22:59:10 +01:00
Laurent Destailleur
4afb85bd1d
Fix: Several fix into workflow/condition for invoice payments or convert
...
into discount.
2014-03-19 22:30:25 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
dc7db87ee5
Perf: Avoid makign a "desc table" for each row we import (for this we
...
are using a global cache array).
2014-03-19 20:23:29 +01:00
Laurent Destailleur
d3e951e1ec
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-03-19 20:22:04 +01:00
Laurent Destailleur
9cd7f68ae8
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2014-03-19 20:03:17 +01:00
Laurent Destailleur
2cced0bf43
Perf: Avoid makign a "desc table" for each row we import (for this we
...
are using a global cache array).
2014-03-19 20:02:39 +01:00
Laurent Destailleur
062c150bc1
Fix: import of fields with value "auto"
2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c
Fix: fails to import when value is 'AUTO' because compare was case
...
sensitive.
2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064
Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
...
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe
Fix PDF: Page break was ko when breaking 2 pages or more.
...
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
5d14322679
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-19 11:46:44 +01:00
Laurent Destailleur
6764d36434
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-19 11:46:30 +01:00
Laurent Destailleur
44952e353d
Fix: Bad format for fk_currency fields (even if they are not used, i fix
...
them).
2014-03-19 11:46:06 +01:00
Laurent Destailleur
dbaea6fa42
Add clean sql requests into repair.sql
2014-03-19 11:40:23 +01:00
Laurent Destailleur
20ef4554e0
Fix: missing unique key on barcode field to avoid database corruption
2014-03-18 23:43:58 +01:00
Laurent Destailleur
ce4c78972a
Fix: Image always fit into window when using cropping feature even if
...
file is a very large file.
2014-03-18 23:24:00 +01:00
Laurent Destailleur
a05ea58181
Fix: form to add images should not show link form
2014-03-18 22:26:46 +01:00
Laurent Destailleur
ada22837a5
Fix: form to add images should not show link form
2014-03-18 22:26:09 +01:00
Laurent Destailleur
3030c2f431
Fix: form to add images should not show link form
2014-03-18 22:24:57 +01:00
Laurent Destailleur
9be52ca2c8
Fix: better way to remove duplicate barcode in repair.sql
2014-03-18 22:16:18 +01:00
Laurent Destailleur
ed05b3780e
Merge pull request #1495 from aspangaro/develop
...
Update language key
2014-03-18 11:52:28 +01:00
aspangaro
58796b85c8
Try to correct travis
2014-03-18 06:53:45 +01:00
Laurent Destailleur
c936638eae
Fix: form to add images should not show link form
2014-03-18 00:41:56 +01:00
Laurent Destailleur
80088c87ac
Fix: Some debugs of module categories
2014-03-18 00:20:39 +01:00
aspangaro
a7c97cc71a
Add title in list of supplier payments
2014-03-17 21:51:31 +01:00
aspangaro
4d6d7c19b2
Correct typo
2014-03-17 21:47:06 +01:00
aspangaro
59128ccefb
Merge branch 'upstream/develop'
2014-03-17 21:10:15 +01:00
Laurent Destailleur
a574997191
Qual: Add unique keys constraints on barcode.
2014-03-17 20:52:06 +01:00
Laurent Destailleur
82c2ef9773
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-17 20:45:09 +01:00
Laurent Destailleur
7eea96c07c
Minor fix into standing order.
2014-03-17 20:43:01 +01:00
aspangaro
ed4b69d0ab
Update language key
2014-03-17 20:36:45 +01:00
Laurent Destailleur
de4ee498ea
Merge pull request #1493 from aternatik/cat_extrafields
...
Fix : bad character into categories lang
2014-03-17 20:32:23 +01:00
Laurent Destailleur
20006a1347
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-17 20:29:19 +01:00
Laurent Destailleur
e491a4dce7
Add code to clean duplicate records
2014-03-17 20:29:01 +01:00
Juanjo Menent
53bb32318a
Fix: Bad action set for invoice
2014-03-17 17:27:47 +01:00
Juanjo Menent
19a3088055
Fix: Add actions events not implemented
2014-03-17 17:05:55 +01:00
Laurent Destailleur
302bcc2fd5
Translation: Sync from transifex.com
2014-03-17 16:15:00 +01:00
Gauthier
eb43bc4982
Correction when adding line with price as '0'
2014-03-17 15:38:12 +01:00
Laurent Destailleur
086b319248
Fix: Translation
2014-03-17 15:16:33 +01:00
Laurent Destailleur
8cf3d258f4
Fix: Bug into calculation of total of time for tasks
2014-03-17 15:13:24 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
Laurent Destailleur
e6bf2cf5aa
Fix: bad char
2014-03-17 12:44:37 +01:00
Laurent Destailleur
14d8bfef3a
New: Improved Opensurvey module: Description of survey use wysiwig
...
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
2014-03-17 12:40:12 +01:00
Laurent Destailleur
81b8961dab
Qual: Dead code war
2014-03-17 11:13:53 +01:00
jfefe
2494b01cf1
Fix : bad character into categories lang
...
Probably due to my table neighbor who constantly moving during devcamp ^^
2014-03-17 10:20:43 +01:00
Laurent Destailleur
7974ae96ad
Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr
...
into aternatik-cat_extrafields
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-03-16 21:38:29 +01:00
Laurent Destailleur
b1498c584d
Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into
...
KreizIT-dluo_step5
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-16 20:49:56 +01:00
Laurent Destailleur
eb5e891cf9
Fix: Not mandatory field must not be not null
...
Fix: field to store amount must be double(24,8)
2014-03-16 20:37:43 +01:00
Laurent Destailleur
58add21719
Merge pull request #1488 from atm-maxime/mko1300
...
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
2014-03-16 20:26:57 +01:00
Laurent Destailleur
b530488da1
Merge pull request #1487 from atm-maxime/mkoPHPUnit
...
New PHPUnit test on project + clean initAsSpecimen
2014-03-16 20:25:49 +01:00
Laurent Destailleur
599142566e
Merge pull request #1492 from aspangaro/develop
...
Fix :: Failed to apply auguria_menu
2014-03-16 20:25:13 +01:00
aspangaro
5175dcf135
Update also eldy menu
2014-03-16 20:17:25 +01:00
Laurent Destailleur
ed4f7fd083
Fix: error
2014-03-16 20:05:07 +01:00
Laurent Destailleur
2d3c700a7d
Fix: When cloning product, autogenerating barcode must not use same
...
number.
Qual: Moved dedicated permission of module to "advance" permissions.
2014-03-16 17:37:54 +01:00
aspangaro
b09d7065c9
Fix :: Failed to apply auguria_menu since integration of salary payment in tax module
2014-03-16 17:30:58 +01:00
Jean-François Ferry
5034356899
Manage extrafields deletion on categories
2014-03-16 16:06:32 +01:00
Jean-François Ferry
e2b47b9919
Category extrafields on categories: edit and view
2014-03-16 16:04:18 +01:00
Jean-François Ferry
d9baae3456
Implement extrafields into category create
2014-03-16 15:25:13 +01:00
Jean-François Ferry
f14d2fbfe0
Add information message for option into categories setup
2014-03-16 15:00:10 +01:00
Jean-François Ferry
55750e16d8
Prepare extrafields into categories
2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
0083e529c7
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
2014-03-16 14:31:02 +01:00
Maxime Kohlhaas
fe767606da
New PHPUnit test on project + clean initAsSpecimen
2014-03-16 13:55:32 +01:00
Laurent Destailleur
b40835c592
Merge pull request #1486 from aternatik/fix_img_cat
...
Fix: bad id when deleting picture on categorie / missing lang
2014-03-16 13:51:39 +01:00
Jean-François Ferry
7e6777f344
Fix: bad id when deleting picture on categorie / missing lang
2014-03-16 13:49:44 +01:00
Maxime Kohlhaas
233a8fa917
Add new PHPUnit test on Entrepot
2014-03-16 11:38:39 +01:00
Maxime Kohlhaas
4d48034ad1
Fix
2014-03-16 09:50:03 +01:00
KreizIT
9be2bb0e60
Travis Fix
2014-03-16 07:00:27 +01:00
Laurent Destailleur
6eac7e1bdc
Fix: CRLF
2014-03-15 23:17:46 +01:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
104f2873da
Qual: Remove code to fix dynamically bad code.
2014-03-15 22:30:40 +01:00
Florian Henry
b7bfadd660
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-15 22:11:51 +01:00
Laurent Destailleur
de59f3aafe
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-15 21:48:14 +01:00
Laurent Destailleur
739f80b46e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-15 21:46:49 +01:00
Laurent Destailleur
7e11551199
Fix: CRLF
2014-03-15 21:45:33 +01:00
Laurent Destailleur
e325921999
Merge pull request #1484 from atm-maxime/develop
...
Fix : Delivery date was displayed twice
2014-03-15 20:55:36 +01:00
Florian Henry
649f535d56
delete extrafield on delete invoice
2014-03-15 19:49:21 +01:00
Maxime Kohlhaas
685c00cd27
Fix : Delivery date was displayed twice
2014-03-15 17:55:57 +01:00
Laurent Destailleur
c41bffcb25
Merge pull request #1482 from jfefe/patch-2
...
Remove debug infos into agenda index
2014-03-15 17:29:54 +01:00
Laurent Destailleur
ad23c88f1a
Merge pull request #1481 from atm-maxime/mko672
...
Add : Stock can be mandatory to use a product
2014-03-15 17:29:31 +01:00
Laurent Destailleur
f9e0660802
Merge pull request #1480 from atm-alexis/develop
...
Add option to set value of credit note by invoice remaining to pay
2014-03-15 17:23:40 +01:00
Drosis Nikos
997e16fec7
Update user.class.php
...
String translated twice
2014-03-15 17:22:34 +01:00
Laurent Destailleur
bba7778a36
Merge pull request #1479 from ndrosis/patch-1
...
Update user.class.php
2014-03-15 17:21:12 +01:00
Simnandez
4e73e4e7c7
Update es_ES from transifex
2014-03-15 16:49:18 +01:00
Florian Henry
7625629491
Fix [ bug #1294 ] Expedition model Merou having problems with long names
2014-03-15 16:40:29 +01:00
Simnandez
5216a14e37
Trad: Update es_ES from transifex
2014-03-15 16:36:25 +01:00
Florian Henry
ee70f21f58
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-15 16:33:24 +01:00
Florian Henry
18c4d890dd
Fix [ bug #1283 ] ROUGET Shipment PDF
2014-03-15 16:32:46 +01:00
Laurent Destailleur
c9ac7fad82
Fix: Field should not be not null
2014-03-15 15:45:21 +01:00
jfefe
f648f85b61
Remove debug infos into agenda index
2014-03-15 15:44:02 +01:00
Maxime Kohlhaas
1911f6fcdc
Task 672 : add stock limitation on shipment + translation
2014-03-15 14:59:27 +01:00
Alexis Algoud
839641feaf
Add option to set value of credit note by invoice lake of payment
2014-03-15 14:52:08 +01:00
Drosis Nikos
8ff0022a53
Update user.class.php
...
String translated twice
2014-03-15 15:23:41 +02:00
Laurent Destailleur
7a304bff62
Merge pull request #1478 from atm-alexis/develop
...
Add feature : import line from origin invoice in the new credit note
2014-03-15 13:48:12 +01:00
Laurent Destailleur
ae8955ae94
Merge pull request #1477 from tiaris/develop
...
correction Magazin -> Magasin
2014-03-15 13:36:25 +01:00
Laurent Destailleur
5025d11a16
Merge pull request #1476 from tbasilici/3.5
...
3.5
2014-03-15 13:32:30 +01:00
Laurent Destailleur
6acaf20c42
Merge pull request #1474 from GPCsolutions/dolibdb
...
Dolidb factorization
2014-03-15 13:27:24 +01:00
Laurent Destailleur
271c2a8929
Merge pull request #1472 from atm-maxime/mko1074
...
Task 1074 : add link to source document on stock movement
2014-03-15 13:21:04 +01:00
Maxime Kohlhaas
b6a2fa61c8
Task 672 : only for product not services
2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8
Task 672 : Prevent use of product not available
2014-03-15 12:45:56 +01:00
Alexis Algoud
e3228b54e5
translate for US
2014-03-15 12:07:39 +01:00
Alexis Algoud
3a21d99edf
Add feature : import line from origin invoice in the new credit note
2014-03-15 12:01:13 +01:00
jean
4aa692c2a7
correction Magazin -> Magasin
2014-03-15 11:31:20 +01:00
kaos
f55bdc64bd
fixes #1300
2014-03-15 11:10:20 +01:00
kaos
1cb71674d7
fixes #1300
2014-03-15 11:06:50 +01:00
KreizIT
3782742aad
- add batch management on supplier dispatch product
...
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
2014-03-15 10:28:01 +01:00
Raphaël Doursenaud
a23f6d6a85
Database: factorized lastqueryerror()
2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
7df97b7cfb
Database: factorized lasterror()
2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
f894df1d9e
Database: factorized lastquerry()
2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
e4e78bdd3e
Database: factorized getLabel()
2014-03-15 08:41:43 +01:00
jfefe
32bef2bf2f
Missing text attribute on input field
2014-03-15 07:01:02 +01:00
Raphaël Doursenaud
3f6b175879
Database: factorized getVersionArray()
2014-03-15 06:40:13 +01:00
Raphaël Doursenaud
73d957f158
Database: factorized common properties
2014-03-15 06:38:52 +01:00
Raphaël Doursenaud
f91e2ec7b2
Database: factorized begin()
2014-03-15 06:17:12 +01:00
Raphaël Doursenaud
739a566156
Database: factorized lasterrno()
2014-03-15 06:07:46 +01:00
Raphaël Doursenaud
0ab6fcaaca
Database: factorized idate()
2014-03-15 06:04:16 +01:00
Raphaël Doursenaud
64fbefdb7c
Database: factorized ifsql()
2014-03-15 05:55:02 +01:00
Raphaël Doursenaud
eb86abff94
Database: factorized jdate()
2014-03-15 05:54:51 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
Laurent Destailleur
1d268c2e86
Merge pull request #1469 from atm-maxime/develop
...
Fix bug 1298 : category nav on member
2014-03-15 00:33:44 +01:00
Maxime Kohlhaas
81db8c0aaf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-03-15 00:02:52 +01:00
Florian Henry
3f6b319d41
Fix deposit invoice
2014-03-14 23:42:45 +01:00
Maxime Kohlhaas
3131b92988
Fix bug 1293 : numbering failed
2014-03-14 23:18:46 +01:00
jean
9ccf99ab4a
correction erreur sql update url = null
2014-03-14 23:04:27 +01:00
Maxime Kohlhaas
b9fbdffab2
Fix bug 1298 : category nav on member
...
modified: htdocs/categories/categorie.php
2014-03-14 22:56:54 +01:00
bouna
e7791a3ade
Update list.php
...
to save the town filtre on prospect list, just i replace:
$param='&stcomm='.$stcomm.'&search_nom='.urlencode($search_nom).'&search_zipcode='.urlencode($search_zipcode).'&search_ville ='.urlencode($search_ville );
search_ville by search_town
2014-03-14 19:46:36 +01:00
philippe grand
f9c48be2a9
fix : display specimen
2014-03-14 18:23:37 +01:00
Laurent Destailleur
32364ac18b
Move skype module from experimental to stable.
2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd
New: Add a public url as a property for products/services.
2014-03-14 13:51:46 +01:00
Laurent Destailleur
aab4800f87
Fix: sql syntax error with pgsql
2014-03-14 12:50:45 +01:00
Laurent Destailleur
561a1a1aac
Fix: Miscellaneous problems on task tabs (withproject parameter lost and
...
download fails).
2014-03-14 02:07:54 +01:00
Laurent Destailleur
c8f63d6160
Fix: Prepare for 3.5.2
2014-03-14 00:17:39 +01:00
Laurent Destailleur
da5610bf3f
Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr
...
into marcosgdf-es_CL-language
Conflicts:
ChangeLog
2014-03-13 23:40:43 +01:00
Laurent Destailleur
bb3632e90c
Fix: Pb with new ckeditor.
2014-03-13 12:45:20 +01:00
Laurent Destailleur
f1b05dd3c2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-13 12:37:39 +01:00
Laurent Destailleur
6cec011df6
New: Add manager name (ceo, director, president...) into main company
...
information page.
2014-03-13 12:22:53 +01:00
Laurent Destailleur
743b0f1834
Merge pull request #1458 from KreizIT/dluo_step4
...
Dluo step4
2014-03-13 11:57:06 +01:00
Laurent Destailleur
1b85f83dbb
Merge pull request #1466 from marcosgdf/minor
...
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Laurent Destailleur
813f55e50b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-13 11:38:48 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
3c842f9b6f
New: Add barcode fields into user database.
2014-03-13 09:11:14 +01:00
Laurent Destailleur
dd7970b549
Fix: Regression, so introduce option to restore old behaviour.
2014-03-12 12:57:26 +01:00
Laurent Destailleur
e76f2170b3
Fix: Avoid home project page to hung when too many tasks opened.
2014-03-12 02:49:11 +01:00
Laurent Destailleur
4a983811d0
Fix: Avoid home project page to hung when too many tasks opened.
2014-03-12 02:43:31 +01:00
Laurent Destailleur
ded5d47afc
Fix: multilangs array was not loaded.
2014-03-12 01:21:18 +01:00
Laurent Destailleur
29e48612c1
Separator is space
2014-03-11 23:51:00 +01:00
Laurent Destailleur
7684e9e4f7
Fix: Add PHPUnit test to check main.lang files does not contains rubish
...
values for keys SeparatorXXX
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys FormatDateShortJaxaXXX
2014-03-11 23:39:26 +01:00
Laurent Destailleur
241ae7a4d1
Fix: Miscellaneous bugs on tasks management
...
Conflicts:
htdocs/core/lib/project.lib.php
2014-03-11 20:53:47 +01:00
Laurent Destailleur
2740886711
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-11 20:38:57 +01:00
Laurent Destailleur
afca98323b
Fix: Miscellaneous bugs on tasks management
2014-03-11 20:38:29 +01:00
Laurent Destailleur
4acf721c8c
Merge pull request #1451 from KreizIT/dluo_step3
...
Batch number management Step 3
2014-03-11 15:54:23 +01:00
Laurent Destailleur
0c321a2a9b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-11 15:50:32 +01:00
Marcos García de La Fuente
735d30a7d3
Corrected features supported tooltip style in livraison tab
2014-03-11 13:20:52 +01:00
Marcos García de La Fuente
cc95163064
Added missing preview column for donations module
2014-03-11 13:20:32 +01:00
Marcos García de La Fuente
b80c93d277
Added missing info tooltip for project document models
2014-03-11 13:15:14 +01:00
Laurent Destailleur
9a40894423
Fix: translation
2014-03-11 13:14:40 +01:00
Marcos García de La Fuente
08465c0e40
Adapted bookmark module admin page to 3.5 style
2014-03-11 13:04:02 +01:00
Marcos García de La Fuente
42622fc7c4
Changed agenda module configuration page
2014-03-11 12:51:37 +01:00
Marcos García de La Fuente
0f0228ca5a
Changed order module configuration page
2014-03-11 12:47:08 +01:00
Marcos García de La Fuente
31afd56897
Changed supplier module configuration page
2014-03-11 12:46:54 +01:00
Marcos García de La Fuente
6419cadde1
Corrected Contract extrafield admin page
2014-03-11 12:46:12 +01:00
Marcos García de La Fuente
8bc273298e
Corrected proposals extrafield admin page translation
2014-03-11 12:38:11 +01:00
Marcos García de La Fuente
960bea2d39
Corrected admin page style of some modules
2014-03-11 12:02:44 +01:00
Laurent Destailleur
86ad05c22e
Merge pull request #1461 from marcosgdf/unknown-error
...
Corrected Unknown error message typo
2014-03-11 11:54:08 +01:00
Laurent Destailleur
5ee17a2f14
Merge pull request #1460 from atm-gauthier/3.5
...
error on ajax_constantonoff function
2014-03-11 11:53:44 +01:00
Marcos García de La Fuente
1d357ec2f9
Removed odd tabs from some modules
2014-03-11 11:53:22 +01:00
Laurent Destailleur
814f6b2b90
Merge pull request #1459 from open-minds/patch-1
...
Fix JavaScript date format in portuguese (Brazil) language file
2014-03-11 11:52:43 +01:00
Laurent Destailleur
6efe28d5c8
Merge pull request #1457 from aspangaro/develop-salary
...
Add salary payment in tax module
2014-03-11 11:49:28 +01:00
Laurent Destailleur
7c6dbf72b0
Merge pull request #1456 from miicha/patch-1
...
I validated the pr but has said by marcosgdf, to not loose it, you must fix translation from web interface at https://www.transifex.com/projects/p/dolibarr/
2014-03-11 11:47:20 +01:00
Laurent Destailleur
324402be0d
Merge pull request #1465 from marcosgdf/bug-1295
...
Fixed bug 1295: Error when creating an agenda extrafield with a number as reference
2014-03-11 11:45:50 +01:00
Marcos García de La Fuente
96143ff4a7
Added missing translation keys
2014-03-11 11:41:19 +01:00
Marcos García de La Fuente
64e76852c5
Corrected projects admin page translation
2014-03-11 11:37:42 +01:00
Marcos García de La Fuente
54b9f72977
Unified module name in members admin page and added spacing before submit button
2014-03-11 11:31:37 +01:00
Marcos García de La Fuente
f9a451dbb9
Corrected intervention translation in module configuration page
2014-03-11 11:27:25 +01:00
Marcos García de La Fuente
0a603777ae
Added missing spacing
2014-03-11 11:27:06 +01:00
Marcos García de La Fuente
371f0cbb8e
Fixed module name in contract admin setup page
2014-03-11 11:15:35 +01:00
Marcos García de La Fuente
096a446b7f
Changed style of contract creation form to the 3.5 style
2014-03-11 11:15:15 +01:00
aspangaro
99b2dfda77
Correct Travis Error
2014-03-11 10:52:49 +01:00
aspangaro
d97f9e50cd
Merge branch 'upstream/develop'
2014-03-11 10:40:22 +01:00
Laurent Destailleur
6860ae84b9
Avoid browser to hang by adding PROJECT_MAX_NB_TASKS.
2014-03-11 09:48:45 +01:00
Laurent Destailleur
932b421d1d
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-11 09:46:51 +01:00
Laurent Destailleur
c9edced656
- New: Add filter on project status into task list. By default, only
...
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
2014-03-11 09:43:26 +01:00
aspangaro
12ffb19cec
Use more explicit name for class and functions
2014-03-11 06:26:18 +01:00
Laurent Destailleur
67de6699d6
Fix: Translation of number for pt_PT
2014-03-11 01:37:37 +01:00
Marcos García de La Fuente
20262a0164
Fix bug #1295 : Error when creating an agenda extrafield with a number as reference
2014-03-10 23:58:16 +01:00
Laurent Destailleur
be97066a74
Fix: Bug into sql request because of incomplete group by
2014-03-10 23:57:19 +01:00
aspangaro
61a5735300
Rename "Sal" class into "Salaries"
2014-03-10 21:17:03 +01:00
Marcos García de La Fuente
89a4c51153
Added es_CL language
2014-03-10 21:13:16 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7
Fix: Must use div for columns of index pages. Not table.
2014-03-10 17:19:02 +01:00
Laurent Destailleur
21bf279248
Fix: css
2014-03-10 16:17:55 +01:00
Gauthier
92e8f54e9a
error on ajax_constantonoff function
2014-03-10 10:53:20 +01:00
Laurent Destailleur
97677f08a9
Fix: Add protection to avoid memory hung
2014-03-10 01:49:44 +01:00
Laurent Léonard
353390c971
Fix JavaScript date format in portuguese (Brazil) language file
2014-03-09 23:37:13 +01:00
Laurent Destailleur
4fe4d0fcbc
Fix: Translation source
2014-03-09 03:14:53 +01:00
Laurent Destailleur
fad9ba6130
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-09 02:49:39 +01:00
Laurent Destailleur
b2116c37d8
Enhance packager:
...
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
2014-03-09 01:37:08 +01:00
Laurent Destailleur
2a853329e5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
htdocs/product/class/product.class.php
2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/main.inc.php
2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f
Fix: Compatibility with v4 of ckeditor (for debian)
2014-03-08 14:06:01 +01:00
Laurent Destailleur
6a3323d6d1
Fix: Readonly mode does not need to use a specific toolbar with ckeditor
...
4.
2014-03-08 13:46:17 +01:00
Laurent Destailleur
7071e233d3
Fix css for ckeditor 4.
2014-03-08 13:36:42 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
c65d681d87
New: Update ckeditor to version 4 (part 1)
2014-03-08 12:11:01 +01:00
aspangaro
db0a45d78f
Merge branch 'upstream/develop'
2014-03-08 04:54:24 +01:00
KreizIT
18e4703438
Travis fix
2014-03-07 12:21:35 +01:00
Laurent Destailleur
0a2a635755
Fix: td balance.
...
Fix: New price was not used when editing a line when margin module was
on.
2014-03-07 11:58:30 +01:00
KreizIT
f0be1f7c21
Fix: Typo on class name
2014-03-07 11:51:26 +01:00
KreizIT
a0f1a60780
Change on shipment for batch product
2014-03-07 11:35:16 +01:00
Laurent Destailleur
32c81588b0
Fix: doxygen
2014-03-07 10:54:57 +01:00
aspangaro
74d3fdae15
Update langs & fix period for salaries in tax module
2014-03-07 06:42:48 +01:00
aspangaro
fca29f4312
Add table into script migration && key language
2014-03-06 21:29:20 +01:00
aspangaro
048b3c01ce
Add salary payment in tax module - Link to user.
...
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
miicha
74df354315
spelling mistake
...
I don't know, where its best to put a comment about wrong translations so I made a PR
2014-03-06 18:58:46 +01:00
Laurent Destailleur
15aebfb7a3
Merge pull request #1455 from marcosgdf/bug-loadban
...
Corrected bug when creating document from ODT template
2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844
Merge pull request #1454 from marcosgdf/locale-line-odt-tags
...
Locale line ODT tags
2014-03-06 18:34:33 +01:00
Laurent Destailleur
06b2c646c3
Fix: Add a space after (int) for travis succes ;)
2014-03-06 18:31:02 +01:00
Laurent Destailleur
0283c16a47
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-06 18:27:09 +01:00
Laurent Destailleur
d54dce1dbe
Merge pull request #1452 from KreizIT/develop
...
Correct multiline comments not manage by dolibarr
2014-03-06 18:24:27 +01:00
Laurent Destailleur
cd3e56a2d0
Merge pull request #1450 from grandoc/develop
...
fix english misspelling
2014-03-06 18:23:51 +01:00
Laurent Destailleur
1396fb1dbe
Merge pull request #1448 from GPCsolutions/tcpdf-monotype
...
TCPDF: Replaced missing courier monotype font by provided freemono
2014-03-06 18:23:22 +01:00
Laurent Destailleur
b762c66c8a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca
Qual: Uniformize search date for lists.
2014-03-06 17:02:27 +01:00
Laurent Destailleur
c4c82f84c5
Fix: Typo
2014-03-06 16:41:56 +01:00
Marcos García de La Fuente
ca0eb7919e
Corrected call to non-existing function
2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7
Missing copyright info
2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3
Corrected array indentation
2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f
Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags
2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78
Fix: infinite loop in function num_public_holiday
2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f
Fix: Number of day calculation. Add PHPUnit case.
2014-03-05 20:52:27 +01:00
Laurent Destailleur
dd3169e1ed
Sync from transifex
2014-03-05 20:47:22 +01:00
Laurent Destailleur
6f60755426
New: Add option MAIN_FAVICON_URL
2014-03-05 17:26:59 +01:00
Laurent Destailleur
8f31af9825
Fix: Translation
2014-03-05 16:42:10 +01:00
Alexis Algoud
d139009ef5
bug on update service with service created in 3.4
2014-03-05 15:29:28 +01:00
Laurent Destailleur
16a074a69b
Use better module id number
2014-03-05 12:25:31 +01:00
Laurent Destailleur
e9b9491a35
Clean database. Fix with firefox.
2014-03-05 12:15:47 +01:00
KreizIT
a80ecc8052
Correct multiline comments not manage by dolibarr
...
Avoid error in loading data and also loading data which not be to.
2014-03-05 12:06:01 +01:00
Laurent Destailleur
a3fcb5ac5a
Fix: Regression with firefox
2014-03-05 11:52:51 +01:00
Laurent Destailleur
6c536d43e5
Can also sort on username. Uniformize code of index page.
2014-03-05 11:37:32 +01:00
KreizIT
d9ea0e0e8c
Travis again (It's susceptible)
2014-03-05 11:30:43 +01:00
KreizIT
feae560aa3
Travis correction.
2014-03-05 11:28:40 +01:00
Laurent Destailleur
e9adec49eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1
New: Add filter on text and status into survey list. Can also sorter on
...
id, text and date end.
2014-03-05 11:22:01 +01:00
KreizIT
58f2bf078b
-Add batch record management
...
-Implements stock increase or decrease with batch number record on product's warehouse tab
2014-03-05 10:54:07 +01:00
Grand Philippe
e32d31f76d
fix english misspelling
2014-03-05 09:58:52 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45
Merge pull request #1449 from KreizIT/dluo_step2
...
Dluo step2
2014-03-05 00:08:58 +01:00
Laurent Destailleur
0bdf1131df
Merge pull request #1447 from zongap/patch-2
...
Update index.php from Project folder
2014-03-05 00:05:28 +01:00
Laurent Destailleur
802ed4e675
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-04 23:56:58 +01:00
Laurent Destailleur
c5e639041e
More doc comment
2014-03-04 23:56:35 +01:00
Laurent Destailleur
82018bf752
Merge pull request #1445 from KreizIT/dluo_step1
...
Batch number management step 1 : database modification
2014-03-04 23:41:20 +01:00
Laurent Destailleur
bea6887f9c
Merge pull request #1444 from atm-alexis/3.5
...
debug planned_workload loosing value on error
2014-03-04 23:39:51 +01:00
KreizIT
7f275dfbf4
- Add table modification for product (forget in step 1)
...
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Raphaël Doursenaud
9a1919238f
TCPDF: Replaced missing courier monotype font by provided freemono
...
The courier font is missing from TCPDF's directory.
This leads to "TCPDF ERROR: Could not include font definition file: courier" being outputed by PHP
when the library attempts to render an element with a monotyped font.
Use freemono instead since it's a better alternative (e.g. supports more glyphs) and is already
shipped with Dolibarr.
2014-03-04 08:19:59 +01:00
Léo
aeaf4bf5f8
Update index.php from Project folder
...
A trailing "quote" sign was causing a problem with the link generation of href in the recap table on dashboard.
2014-03-04 02:29:18 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
KreizIT
c1f88d99b9
Batch number management step 1 : database modification
2014-03-03 14:11:19 +01:00
Laurent Destailleur
df829177bc
Fix: Submit form of graph box was reseting params of others.
2014-03-02 17:45:40 +01:00
Alexis Algoud
9de372d4b1
debug planned_workload loosing value on error
2014-03-02 17:33:51 +01:00
Laurent Destailleur
fd9d0747c8
Fix: Bad description
2014-03-02 16:44:31 +01:00
Laurent Destailleur
d9dc8de4e6
Fix: Badd error message
2014-03-02 15:58:02 +01:00
Laurent Destailleur
748d769140
Fix: [ bug #1280 ] service with not end of date was tagged as expired.
2014-03-02 15:50:26 +01:00
Laurent Destailleur
8bd72cc21f
Fix: wrapping into combo
2014-03-01 20:05:08 +01:00
Laurent Destailleur
7d7a72b8f1
More interactive autoselect of fields
2014-03-01 20:02:35 +01:00
Laurent Destailleur
d69cee03d8
More interactive autoselect of fields
2014-03-01 19:45:13 +01:00
Laurent Destailleur
c6fb7996ba
Fix: [ bug #1238 ] When creating accompte with a %, free product are
...
used for calculation.
2014-03-01 19:11:13 +01:00
Laurent Destailleur
7db903e671
Fix: special code was lost during update
2014-03-01 16:58:10 +01:00
Laurent Destailleur
998ecc3c15
Optimize code.
2014-03-01 15:59:09 +01:00
Laurent Destailleur
b6cefee45a
Fix: [ bug #1240 ] traduction
2014-03-01 15:21:11 +01:00
Laurent Destailleur
0b83f1a670
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0
Fix: [ bug #520 ] Product statistics and detailed lists are wrong
2014-03-01 15:05:00 +01:00
Laurent Destailleur
dfb4117bb5
Fix: Invalid image link
2014-03-01 14:58:06 +01:00
Laurent Destailleur
16d759b0d6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-01 14:55:11 +01:00
Laurent Destailleur
325b9c9688
Qual: Removed dead code
2014-03-01 14:54:11 +01:00
Laurent Destailleur
ea773531b5
Fix: [ bug #1206 ] PMP price is bad calculated
2014-03-01 14:49:30 +01:00
Laurent Destailleur
206181a542
Merge pull request #1441 from syrus34/patch-3
...
Update commondocgenerator.class.php
2014-03-01 13:40:14 +01:00
Laurent Destailleur
a084887442
Merge branch 'project-translations' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations
Conflicts:
ChangeLog
2014-03-01 13:38:50 +01:00
Laurent Destailleur
8c4369eacc
Merge pull request #1442 from aspangaro/develop
...
Problem of presentation when skype module is enabled
2014-03-01 13:37:36 +01:00
Laurent Destailleur
19b68e87e9
Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1123
Conflicts:
ChangeLog
2014-03-01 13:29:34 +01:00
BENKE Charles
e5e7b4ce6a
Update llx_00_c_pays.sql
...
adding burundi in pays database
2014-03-01 12:30:39 +01:00
Laurent Destailleur
45898a989c
Fix: Translation done twice
2014-03-01 10:16:03 +01:00
Laurent Destailleur
66a3a28eb2
Fix: Update translation guide
2014-02-28 22:51:04 +01:00
Laurent Destailleur
072bb709ff
Fix: dead code
2014-02-28 22:09:40 +01:00
Laurent Destailleur
6662f8b5a3
Fix: Bad picto for project setup page
2014-02-28 21:54:50 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
68a508a0d1
Fix: sql error on numbering module for tasks
2014-02-28 21:40:08 +01:00
Laurent Destailleur
74404749c6
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a
2014-02-28 16:00:57 +01:00
aspangaro
cd910b30c9
Problem of presentation when skype module is enabled
2014-02-28 07:20:15 +01:00
syrus34
dbdb8de79d
Update commondocgenerator.class.php
...
With version 3.5, a company can have several bank account
2014-02-28 07:06:38 +01:00
Laurent Destailleur
de159d569a
Fix: Missing transactions
2014-02-27 16:40:25 +01:00
BENKE Charles
303c459777
Update modProjet.class.php
...
bad incrementation
2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a
Merge pull request #1421 from defrance69/patch-30
...
Update modProjet.class.php
2014-02-27 11:19:28 +01:00
Laurent Destailleur
8f0e96fd02
Merge pull request #1440 from grandoc/develop
...
anglicized
2014-02-27 11:17:30 +01:00
Laurent Destailleur
a453d24eea
Merge pull request #1437 from marcosgdf/invoice-types
...
Replacing invoice integer types with Facture and FactureFournisseur constants
2014-02-27 11:11:19 +01:00
Laurent Destailleur
b21d1cd5b2
Merge pull request #1439 from altairis-fr/develop
...
Fix: default ref was DOLIBARR instead of SPECIMEN, so specimen generation did not work and crashed dolibarr
2014-02-27 11:09:35 +01:00
Laurent Destailleur
827f7e898a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-27 10:50:27 +01:00
Laurent Destailleur
06b1c8b64a
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
2014-02-27 10:47:15 +01:00
Laurent Destailleur
f7fe25e408
Uniformize code to prepare mass update
2014-02-27 10:37:23 +01:00
philippe
5c4ceb1a53
anglicized
2014-02-27 10:06:11 +01:00
philippe
1223e6a08b
anglicized
2014-02-27 09:54:31 +01:00
philippe
4a6fab2b00
anglicized
2014-02-27 09:42:00 +01:00
philippe
60efe5734f
anglicized
2014-02-27 09:36:09 +01:00
Laurent Destailleur
2b019575cc
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-02-26 17:25:48 +01:00
Laurent Destailleur
4be679a7b2
Second try for Fix: The delivery date was missing.
2014-02-26 17:25:32 +01:00
simnandez
afebf86bf1
Fix: Loading actions extrafields fails.
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-26 16:55:42 +01:00
Laurent Destailleur
0c2ca119d7
Fix: Add a test to avoid the non stable and experimental fuc...
...
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
2014-02-26 16:51:38 +01:00
simnandez
8ffa11fe16
Fix: Loading actions extrafields fails.
2014-02-26 16:50:38 +01:00
Christophe Battarel
66db46a693
Fix: default ref was DOLIBARR instead of SPECIMEN, so specimen generation did not work and crashed dolibarr
2014-02-26 15:57:43 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
df2eb95882
Fix: Right to left support
2014-02-26 15:42:32 +01:00
Laurent Destailleur
9505f9e47c
Fix: The delivery date was missing.
2014-02-26 15:41:56 +01:00
Laurent Destailleur
855dac45ea
Fix: select_comptes was always making a filter on field clos making
...
other filter field not working in some case.
2014-02-26 15:29:40 +01:00
Laurent Destailleur
0918fd21b0
Fix: Css errors
2014-02-26 14:48:53 +01:00
Marcos García de La Fuente
607effdc7a
Replacing invoice integer types with FactureFournisseur constants
2014-02-26 01:09:34 +01:00
Marcos García de La Fuente
0eedadd7f2
Replacing invoice integer types with Facture constants
2014-02-26 01:09:22 +01:00
Marcos García de La Fuente
8099d7ff42
Replacing invoice integer types with Facture constants
2014-02-26 01:03:26 +01:00
Marcos García de La Fuente
ad928cb443
Replacing invoice integer types with Facture constants
2014-02-26 00:56:36 +01:00
Laurent Destailleur
e8e8879e9e
Fix: Right to left support
2014-02-25 19:26:18 +01:00
Laurent Destailleur
a822bc0736
Fix: The delivery date was missing.
2014-02-25 19:22:00 +01:00
Laurent Destailleur
d4d69e41b1
Fix: Right to left support
2014-02-25 19:14:58 +01:00
Laurent Destailleur
abff284ab1
Fix: The delivery date was missing.
2014-02-25 19:07:42 +01:00
Laurent Destailleur
e8cadf3a3e
New: Add form search customer order on commercial main page.
2014-02-25 18:33:04 +01:00
Laurent Destailleur
1790f905c9
Removed some code specific to databases and use instead correct abstract
...
method of drivers.
2014-02-25 18:25:17 +01:00
Laurent Destailleur
3c0e5b8a53
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-25 17:07:32 +01:00
Laurent Destailleur
3f05651b94
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-02-25 16:14:51 +01:00
Laurent Destailleur
736778d56a
New: Add message to explain how to use the page. Make things more clear
...
for user.
2014-02-25 16:13:23 +01:00
Laurent Destailleur
63a2aa3365
Fix: sql error with postgres when creating extrafield with an upper cas
...
character. code for new fields must be always lowercase.
2014-02-25 15:48:13 +01:00
Laurent Destailleur
7241714551
Merge pull request #1435 from marcosgdf/export-translations
...
Corrected export translations
2014-02-25 14:11:40 +01:00
Laurent Destailleur
c220d63c3e
Merge pull request #1434 from marcosgdf/deprecated-code
...
Deprecated code
2014-02-25 14:10:59 +01:00
Laurent Destailleur
f7e7460ad1
Merge pull request #1432 from marcosgdf/invoice-constants
...
Better documentation of invoice types
2014-02-25 14:06:56 +01:00
Marcos García de La Fuente
e963f55593
Corrected CS error
2014-02-25 13:34:33 +01:00
Laurent Destailleur
67d44f2cb8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-25 10:01:43 +01:00
Laurent Destailleur
8a71245186
Look: Use higher menu entries with jmobile.
2014-02-25 10:00:57 +01:00
Marcos García de La Fuente
f7eb4c5b14
Updated user export labels
2014-02-25 04:39:41 +01:00
Marcos García de La Fuente
4fe8e00601
Removed deprecated code
2014-02-25 04:29:34 +01:00
Marcos García de La Fuente
d69939b7b1
Function dol_clone is now a deprecated function
2014-02-25 04:29:09 +01:00
Marcos García de La Fuente
4411908b23
Fixed translations of project export wizard
2014-02-25 04:18:13 +01:00
Marcos García de La Fuente
4157452c6d
Translated export filters
2014-02-25 03:23:08 +01:00
Marcos García de La Fuente
7ac405e067
Added SpecialCode translation key
2014-02-25 03:20:37 +01:00
Marcos García de La Fuente
968b5771db
Corrected project contact types translation
2014-02-25 02:42:10 +01:00
Marcos García de La Fuente
f464528dd9
Corrected indentation to tabs
2014-02-25 01:18:29 +01:00
Marcos García de La Fuente
e83e2bbbd7
Fixed bug #1123 : Paid deposit invoices are always shown as partially paid when fully paid
2014-02-25 01:17:38 +01:00
Marcos García de La Fuente
e90f068e3b
Documented invoice types
2014-02-25 01:10:18 +01:00
Peter Fontaine
8ec10f8efa
Add state_id in contact for individual third party
2014-02-24 21:20:06 +01:00
Laurent Destailleur
b1eef7cd42
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a
...
product
2014-02-24 17:37:35 +01:00
Laurent Destailleur
f537f62aea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/impayees.php
2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743
New: Sending remind of unpayed invoices by emails (need tester)
2014-02-24 16:50:36 +01:00
Laurent Destailleur
2534da9a9f
Merge pull request #1422 from defrance69/patch-31
...
Update fiche.php
2014-02-24 10:33:40 +01:00
Laurent Destailleur
37d2d990af
Add comment into doc
2014-02-24 10:17:56 +01:00
Laurent Destailleur
28739414f2
Merge pull request #1430 from FHenry/develop
...
Price management enhancement (multiprice level, price by … customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
2014-02-24 10:14:48 +01:00
Laurent Destailleur
6e03607920
Merge pull request #1423 from aternatik/ws_lang
...
New : can use translations into products webservice
2014-02-24 10:00:34 +01:00
Laurent Destailleur
df3c51fb30
Merge pull request #1427 from defrance69/patch-32
...
Update project.class.php
2014-02-24 09:59:36 +01:00
Laurent Destailleur
a797a5e665
Clean comment and make some implementations
2014-02-24 09:52:48 +01:00
Laurent Destailleur
404d24a029
Merge pull request #1426 from GPCsolutions/dbinterface
...
Common Database interface
2014-02-24 09:24:35 +01:00
Laurent Destailleur
0a3737ea02
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-23 22:24:32 +01:00
Laurent Destailleur
68058d0e4f
Add a confirm box before deleting.
2014-02-23 22:24:13 +01:00
Florian Henry
ec8ad9f8bb
codesniffer
2014-02-23 20:10:05 +01:00
Florian Henry
4cbdf32ae6
codesniffer
2014-02-23 17:21:26 +01:00
Florian Henry
d242f4930d
php codesniffer
2014-02-23 17:01:51 +01:00
Florian Henry
720746b1b2
Fix php sniffer
2014-02-23 16:29:16 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Florian Henry
e3ca6cf3d3
Fix phpunit code siffer errors
2014-02-23 10:47:51 +01:00
Florian Henry
92dc21be04
Fix project task numbering rule
2014-02-23 10:24:30 +01:00
BENKE Charles
42ffb4b3e7
Update project.class.php
...
escape ref of project if as ' is typed inside as ref (crazy user)
2014-02-21 22:39:45 +01:00
Raphaël Doursenaud
0a74467296
Added FIXMEs and TODOs on all dummy methods in database drivers
2014-02-21 14:57:19 +01:00
Raphaël Doursenaud
501ffb12b3
Added dummy methods according to interface for Microsoft SQL and PostgreSQL
...
Please implement if you have the required knowledge
2014-02-21 14:52:21 +01:00
Raphaël Doursenaud
283fec164e
Implemented rollback according to interface for Microsoft SQL and PostgreSQL
2014-02-21 14:40:10 +01:00
Raphaël Doursenaud
894ac6fdc0
Added missing method to mysqli class
2014-02-21 14:27:29 +01:00
Raphaël Doursenaud
ea14ca10cd
Extracted mysql interface
2014-02-21 14:23:32 +01:00
simnandez
92a8fde88b
New: Automatic events for sending mails showing info about mail linked
...
objects.
2014-02-21 12:53:06 +01:00
simnandez
36bc225208
Trad: es_ES Sync from transifex
2014-02-21 12:49:24 +01:00
Laurent Destailleur
1685729393
New: Can reset barcode also for barcode already defined.
2014-02-20 23:09:24 +01:00
Laurent Destailleur
07ee85b097
New: Can reset barcode also for barcode already defined.
2014-02-20 22:08:32 +01:00
Laurent Destailleur
e5136487bd
Fix: The customer code was set to uppercase when using numbering module
...
leopard. We must keep data safe of any change.
2014-02-20 16:51:37 +01:00
Laurent Destailleur
6c103f4c6b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-20 09:52:01 +01:00
jfefe
f8a98c51bf
Qual : phpdoc
2014-02-20 01:41:45 +01:00
jfefe
75d2215733
New : can use translations into products webservice
...
Add lang parameter to force langage
2014-02-20 01:39:48 +01:00
Laurent Destailleur
9da84e4dd8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-20 00:37:20 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
simnandez
c2db656c86
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:33:22 +01:00
simnandez
7511f626b3
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:32:20 +01:00
Laurent Destailleur
0b7f623c31
New: Add an admin page to make a mass init of barcode values for all
...
products.
2014-02-19 17:04:21 +01:00
Laurent Destailleur
5a29b3d546
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916
Fix: Bad space in predefined messages.
...
Fix: Signature was not added for email sent from thirdparty page.
2014-02-19 15:33:04 +01:00
Laurent Destailleur
3ea8af957a
First version of page to init barcode
2014-02-19 11:19:43 +01:00
Laurent Destailleur
8c9d2418d2
Qual: Move common javascript function into lib_head.js
2014-02-19 11:08:43 +01:00
Laurent Destailleur
d7c9ebd5ee
Fix: sort on supplier ref.
2014-02-19 03:04:56 +01:00
Laurent Destailleur
03a60236af
Fix: sort on supplier ref.
2014-02-19 03:03:26 +01:00
Laurent Destailleur
96e7985266
Fix: Translation of menu entries must not be into admin lang file (We
...
don't want to load this file for common pages).
2014-02-19 02:27:13 +01:00
Laurent Destailleur
18f90520cf
Uniformize fields shown
2014-02-19 02:19:54 +01:00
Laurent Destailleur
2e67bbc382
Maxi debug of barcode feature.
...
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c
Qual: Clean code for adding menu entries into Modules system admin
...
entry.
New: Add entry for admin page Mass barcode init.
2014-02-18 20:49:22 +01:00
Laurent Destailleur
3a4161fdf7
Fix: css
2014-02-18 19:49:36 +01:00
Laurent Destailleur
396ac5fb2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-18 18:55:50 +01:00
BENKE Charles
05865a7978
Update fiche.php
...
somme other error
2014-02-18 15:49:16 +01:00
BENKE Charles
64074305d3
Update fiche.php
...
double line
2014-02-18 15:22:45 +01:00
Laurent Destailleur
5780f14a65
Qual: Removed TODO and add test to report bug.
2014-02-17 18:27:45 +01:00
Laurent Destailleur
867c83680b
Merge remote-tracking branch 'origin/3.5' into develop
2014-02-17 18:22:49 +01:00
Laurent Destailleur
342ee2e6f6
Qual: Add a TODO to warn to remove this bug.
2014-02-17 18:22:15 +01:00
Laurent Destailleur
1cfcda702e
Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not
...
work.
2014-02-17 17:32:25 +01:00
Laurent Destailleur
c8d6a88f8a
Clean xdebug page.
2014-02-17 16:30:22 +01:00
Laurent Destailleur
860ca15cfc
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2014-02-17 15:27:30 +01:00
Laurent Destailleur
e1efd88155
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-02-17 15:22:02 +01:00
Laurent Destailleur
8839ae38d3
Fix: [ bug #1241 ] error in request in select_paper file
...
/core/class/html.formadmin.class.php
2014-02-17 15:21:19 +01:00
BENKE Charles
8ac8af0f40
Update modProjet.class.php
...
bad incrementation
2014-02-17 12:12:18 +01:00
Laurent Destailleur
fa7e7c75bf
Fix: Add a protection if user has no option to edit stock
2014-02-17 11:48:57 +01:00
Laurent Destailleur
f987a43358
Fix: Translation
2014-02-17 11:19:50 +01:00
Laurent Destailleur
de64ce5b2a
Fix: user right on Holiday for month report nor working
2014-02-17 00:09:48 +01:00
Laurent Destailleur
abc96b51fa
Enable extrafields for customer order, proposal and invoice lines. This
...
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
2014-02-16 23:51:29 +01:00
Laurent Destailleur
935b30470d
Fix: Missing nowrap
2014-02-16 20:09:25 +01:00
Laurent Destailleur
908c39098d
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
85e93872b3
Fix: javascript calculation of unit price from margin rate was broken.
2014-02-16 19:42:43 +01:00
Laurent Destailleur
3aba53a9ae
Fix: javascript calculation of unit price from margin rate was broken.
2014-02-16 19:26:41 +01:00
Laurent Destailleur
b081083a1a
Fix: Bad management of date.
...
Fix: Submit button was not visible making not possible to filter on
date.
Fix: Use standard css style instead of hardcoded css.
2014-02-16 17:07:17 +01:00
Laurent Destailleur
fd22c9b69a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-15 15:23:47 +01:00
Laurent Destailleur
7e3c2d40ba
New: Make difference between virtual and physical stock easier to
...
understand.
2014-02-15 14:14:49 +01:00
Laurent Destailleur
ff16d7446b
Update translation
2014-02-14 17:54:45 +01:00
Laurent Destailleur
7e2027ec39
Fix: Can not set delay to zero.
2014-02-14 13:05:49 +01:00
Laurent Destailleur
4b8d39af9d
Fix: Do not report trigger errors twice.
...
Fix: Error when creating event was not reported.
Conflicts:
htdocs/comm/action/fiche.php
2014-02-14 13:05:04 +01:00
Laurent Destailleur
1a3bace4e6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-14 12:59:26 +01:00
Laurent Destailleur
4b5748fd12
Fix: Can not set delay to zero.
2014-02-14 12:58:03 +01:00
Laurent Destailleur
3e3c541e4c
Fix: Do not report trigger errors twice.
...
Fix: Error when creating event was not reported.
2014-02-14 12:54:04 +01:00
Laurent Destailleur
57153e4de4
Try a cleaner javascript escape function.
2014-02-13 23:40:39 +01:00
Laurent Destailleur
d6ba18cc20
Merge pull request #1416 from syrus34/patch-2
...
Add fields company_iban and company_bic
2014-02-13 17:53:08 +01:00
philippe
6f129c3800
display adherent module for external user
2014-02-13 16:36:34 +01:00
Laurent Destailleur
ead7df3306
Add backslash
2014-02-13 10:54:03 +01:00
Laurent Destailleur
b499efeccf
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/compta/sociales/index.php
htdocs/compta/tva/index.php
2014-02-12 22:29:56 +01:00
Laurent Destailleur
7d74d0d3bd
CFix: The order field for prospect level was not visible making
...
dictionnary useless.
2014-02-12 22:28:16 +01:00
Laurent Destailleur
ccab2b7af4
Fix: Must use "null" for value when finished is not defined but not when
...
finished is "0".
2014-02-12 19:00:06 +01:00
syrus34
79d85d5888
Add fields company_iban and company_bic
2014-02-12 18:58:12 +01:00
Laurent Destailleur
5501809844
Fix: sql compare on int must not contains quotes.
2014-02-12 18:47:16 +01:00
Laurent Destailleur
cd44548867
Merge pull request #1414 from atm-alexis/3.5
...
In certain case, holiday_users won't be update (1 delete, 1 add for ex)
2014-02-12 18:39:56 +01:00
Laurent Destailleur
191ff05873
Fix: W3C.
2014-02-12 18:36:49 +01:00
Laurent Destailleur
0d03f13777
Add comments
2014-02-12 15:21:06 +01:00
Laurent Destailleur
2e7631fa78
Fix: translation
2014-02-12 15:17:33 +01:00
Laurent Destailleur
b4977cd542
Fix: Bad permission var
2014-02-12 12:52:31 +01:00
Laurent Destailleur
634c5b64f1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/product/fiche.php
2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139
Fix: colspan for extrafields
2014-02-12 00:23:15 +01:00
Laurent Destailleur
05c4961a36
Better css
2014-02-12 00:10:49 +01:00
Laurent Destailleur
2d6b5e377c
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-02-12 00:02:16 +01:00
Laurent Destailleur
4869b95601
Fix: Default size too long making screen hang.
2014-02-12 00:01:22 +01:00
Laurent Destailleur
492dec0854
Sync from transifex
2014-02-11 23:19:22 +01:00
Laurent Destailleur
e62b6c1cc4
Fix: Not using correct vars names
2014-02-11 15:43:05 +01:00
Laurent Destailleur
598098ff18
Fix: Not using correct vars names
2014-02-10 16:09:21 +01:00
Laurent Destailleur
444bc1c6a1
New increase length of url into bookmark module.
2014-02-10 16:05:13 +01:00
Alexis Algoud
d8e5fd20d2
In certain case, holiday_users won't be update (1 delete, 1 add for ex)
...
Add a fonction for count the real number of user without CP
2014-02-10 09:39:26 +01:00
Laurent Destailleur
f743cbafa2
Fix: doxygen
2014-02-10 01:43:35 +01:00
Laurent Destailleur
213a64edcc
Fix for missing param.
2014-02-10 01:36:15 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
e833849f85
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-10 01:12:14 +01:00
Laurent Destailleur
d81685a737
Merge pull request #1409 from atm-geoffrey/develop
...
Add hooks and triggers on supplier invoice, supplier order and product supplier price
2014-02-10 01:11:13 +01:00
Laurent Destailleur
e71fb36b3c
Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually.
...
We keep bic size field to 20 instead of 11 for backward compatibility.
2014-02-10 01:08:49 +01:00
Laurent Destailleur
b18c9603f1
Fix: Even if accounting module are disabled, we need field. Accounting
...
mdules disabled = we don't need menu+pages+reports features but
properties on product may be still used (for example to import/import
when using an external accounting software).
2014-02-10 01:04:40 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
94be4ec897
Fix: Avoid error in migration from 3.1 version.
...
Fix: Suggested migration choice was ko from x.y.z to x.y.z+1
2014-02-08 14:55:27 +01:00
Laurent Destailleur
6a84a7f935
Prepare version 3.5.1
2014-02-08 13:56:28 +01:00
Laurent Destailleur
70ab096b79
More simple specimen for test
2014-02-08 12:58:27 +01:00
Laurent Destailleur
59a25832bd
Fix: Removed large comment into migration script
2014-02-08 12:16:27 +01:00
Laurent Destailleur
b94f7a6a6d
Fix some amount were missing local version.
2014-02-08 03:51:30 +01:00
Laurent Destailleur
7f7222555e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-08 03:45:48 +01:00
Laurent Destailleur
f6f6022b7a
Add eu_ES language.
2014-02-08 03:44:53 +01:00
Laurent Destailleur
fdfb7f1a8a
Fix: Be sure there is no duplicate default rib.
2014-02-08 03:24:48 +01:00
Laurent Destailleur
5b89bc18f5
[ bug #1231 ] PDF always generated in interventions
2014-02-08 02:46:05 +01:00
Laurent Destailleur
aad7885bca
Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en
...
base
2014-02-08 02:35:59 +01:00
Laurent Destailleur
b750e98d40
Fix: Pb of file upload and download.
2014-02-08 02:02:01 +01:00
Laurent Destailleur
abc8649e02
Fix: Bug of import of agenda when using https link
2014-02-08 01:16:20 +01:00
Laurent Destailleur
319b13dafb
Fix: Field nature is not correctly filled.
2014-02-08 01:02:09 +01:00
Laurent Destailleur
b714347b6b
Fix: Substition of extra field was ko for order.
2014-02-08 01:01:31 +01:00
Laurent Destailleur
fb789b8197
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-02-08 00:40:51 +01:00
Laurent Destailleur
56a36ba9c4
Fix: bad translation of date format for pt_BR
2014-02-08 00:36:38 +01:00
simnandez
34e73e1b7c
Trad: es_ES Sync from transifex
2014-02-07 18:12:30 +01:00
Laurent Destailleur
e1880a6394
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-06 20:57:58 +01:00
Laurent Destailleur
43970b3bd6
Removed some TODO
2014-02-06 20:45:50 +01:00
Laurent Destailleur
80046a5310
Qual: Mutualize code
2014-02-06 20:40:01 +01:00
Laurent Destailleur
cfb9150e10
Qual: Removed a hook that is a duplicate of trigger (CRUD event must be
...
enhanced by triggers, not hook).
Qual: Delete trigger must be done BEFORE delete of object, not after.
2014-02-06 20:35:11 +01:00
Laurent Destailleur
9e06f185c5
Fix: Fix problem of invalid paypal link with \n.
2014-02-06 18:19:49 +01:00
Laurent Destailleur
d1951393c7
Fix: priority is a field smallint.
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-06 17:09:41 +01:00
Laurent Destailleur
c9b1c562cc
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-02-06 16:58:53 +01:00
Laurent Destailleur
9166dc2d8c
Fix: priority is a field smallint.
2014-02-06 16:57:45 +01:00
Laurent Destailleur
e22e4fc4d7
Sync from transifex
2014-02-05 23:10:44 +01:00
Laurent Destailleur
7078970ed1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2014-02-05 21:03:05 +01:00
Laurent Destailleur
255a1f6497
Fix: String translated twice
2014-02-05 20:57:43 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
db006dcdf8
Fix: Missing lang->load
2014-02-05 12:52:00 +01:00
Laurent Destailleur
e3ac9db9ec
Fix: Data was encode twice making bad translation for language with
...
special chars.
2014-02-05 12:11:39 +01:00
geoffrey.girard
bf6b4537b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2014-02-05 09:19:54 +01:00
geoffrey.girard
c7f8699973
correction : delete trigger must be called before the delete of object
2014-02-05 09:19:14 +01:00
Laurent Destailleur
26d134e4d8
Merge pull request #1404 from aspangaro/develop
...
Add The base accountancy belgium plan for accounting - Thanks delcroip
2014-02-04 17:10:29 -08:00
Laurent Destailleur
f50c970724
Revert "Improved translation"
...
This reverts commit ec8f664085
2014-02-05 02:07:04 +01:00
Laurent Destailleur
d7b1fbdeec
Merge pull request #1405 from ricardosequeira/develop
...
Improved translation
2014-02-04 17:04:50 -08:00
unknown
a6a26ec313
Fixed: Write note into field "note_private" in llx_facture ("note" deprecated)
2014-02-05 02:03:09 +01:00
Laurent Destailleur
579c7e8994
Merge pull request #1407 from modula71/develop
...
Fixed: Write note into field "note_private" in llx_facture ("note" deprecated)
2014-02-04 17:01:29 -08:00
Laurent Destailleur
e8dc517cba
Merge pull request #1410 from aternatik/fix_ws_user
...
Fix user webservice
2014-02-04 16:49:17 -08:00
Laurent Destailleur
9a985821d2
Fix: doxygen
2014-02-04 21:08:25 +01:00
Laurent Destailleur
f8a68b0449
Fix: Missing translation
2014-02-04 20:57:22 +01:00
Laurent Destailleur
ea6a747adb
Merge pull request #1408 from atm-gauthier/develop
...
add hook "doActions" on supplierprice form
2014-02-04 11:51:01 -08:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335
Fix: Missing vars and bar id.
2014-02-04 20:41:23 +01:00
jfefe
1ae87887fb
Fix into user webservices : better error management and country detection
...
- Avoid errors when creating an user with thirdparty
- Add country detection in webservices when country_code is filled
2014-02-04 18:03:22 +01:00
geoffrey.girard
676101b02f
Add trigger on deleteline for supplier order and move trigger on deleteline for supplier invoice after delete sql query
2014-02-04 17:35:27 +01:00
geoffrey.girard
efa7a16c07
Add hook printObjectLine supplier order and supplier invoice
2014-02-04 17:30:48 +01:00
geoffrey.girard
05ceecd184
add hook printObjectLine on product supplier prices list
2014-02-04 16:55:09 +01:00
Gauthier
9cdfaa3ffe
add hook "doActions" on supplierprice form
2014-02-04 10:48:35 +01:00
aspangaro
4e23a21225
Merge branch 'upstream/develop'
2014-02-03 22:08:54 +01:00
Laurent Destailleur
408a028320
Fix: Must return a string
2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832
Fix: function must return a string
2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef
New: Add option MAIN_DISABLE_AJAX_COMBOX
2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
Laurent Destailleur
e5cd32623c
Qual: Uniformize code of payment between customer and supplier payments.
...
New: Add warning if supplier payment is higher that due amount.
2014-02-03 18:42:24 +01:00
Laurent Destailleur
2b2d764180
Fix: ref and date of supplier invoice.
...
Fix: Check on bank account
2014-02-03 17:30:35 +01:00
unknown
d7bc52b957
Fixed: Write note into field "note_private" in llx_facture ("note" deprecated)
2014-02-03 17:25:02 +01:00
Ricardo Sequeira
ec8f664085
Improved translation
...
Portuguese translation
2014-02-02 18:45:51 +00:00
Laurent Destailleur
77b3c9d2eb
Fix: Bad constant
2014-02-02 19:00:56 +01:00
aspangaro
bccf23711d
Kill clics - Accountancy in product card - Not display accountancy_code when module (comptabilite | accounting | accounting expert) is disabled
2014-02-02 18:26:17 +01:00
Ricardo Sequeira
dea829a3cf
Improved translation
...
holiday translation
2014-02-02 17:21:08 +00:00
aspangaro
05c8039cf9
Delete rowid in case of an other accountancy plan already exist.
2014-02-02 09:50:53 +01:00
aspangaro
fda0dec260
Add The base accountancy belgium plan for accounting - Thanks delcroip
...
http://www.dolibarr.fr/forum/12-howto--aide/47966-pcmn-plan-comptable-minimum-normalise-belgique
2014-02-02 06:45:05 +01:00
Laurent Destailleur
2d15e2c759
Fix: Link on supplier in document invoice must go to supplier card.
2014-02-01 16:31:23 +01:00
Laurent Destailleur
7de0438299
Fix: Link on supplier in document invoice must go to supplier card.
2014-02-01 16:26:41 +01:00
BENKE Charles
b86322c14a
Update commonobject.class.php
...
hook module need extrafields parameter too
2014-02-01 12:55:05 +01:00
Laurent Destailleur
9aaafde6d5
Fix: Pb with cache files for graphical boxes:
...
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
2014-01-31 18:48:57 +01:00
Laurent Destailleur
ba931e18d4
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57
Fix: used bad constant name
2014-01-31 16:06:28 +01:00
Laurent Destailleur
28b252849f
Fix: W3C
2014-01-31 13:02:48 +01:00
Laurent Destailleur
7f15aa4582
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
5b218c3c5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-01-31 10:10:38 +01:00
Laurent Destailleur
bb7fc8631b
Qual: Uniformize index name to match
...
http://wiki.dolibarr.org/index.php/Language_and_development_rules#SQL_rules
2014-01-31 10:08:25 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
c5d5d6a8d6
A better fix to have default statut to enabled when created an address.
2014-01-30 18:17:52 +01:00
Laurent Destailleur
d15aeb268f
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-30 18:12:31 +01:00
Laurent Destailleur
47ff6a68bb
Fix: Test were inverted.
2014-01-30 18:11:40 +01:00
simnandez
17581dd6d6
Fix: Default status into contact creation must be Actif
2014-01-30 12:21:58 +01:00
simnandez
ee72a9a4e6
Fix: Default status into contact creation must be Actif
2014-01-30 12:20:36 +01:00
Laurent Destailleur
85436f871c
Sec: Missing permission tests
2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d
Fix: Bad output of extrafields when list is used.
2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f
Sec: Missing permission tests
2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e
Fix: Bad output of extrafields when list is used.
2014-01-30 10:48:10 +01:00
Laurent Destailleur
8d86778a66
Merge pull request #1400 from jfefe/fix_migr
...
Fix : bad sql request during migration
2014-01-29 16:52:52 -08:00
Laurent Destailleur
470f88bacd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-01-30 01:43:44 +01:00
Laurent Destailleur
bd3a64d580
Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on
...
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
2014-01-30 01:35:01 +01:00
Laurent Destailleur
d6c4fa5fe3
Qual: Normalize code
2014-01-30 00:40:00 +01:00
Jean-François Ferry
a0c3527e30
Fix : bad sql request during migration
2014-01-29 19:19:23 +01:00
BENKE Charles
a10ccb4d92
Update objectline_add.tpl.php
...
Adding extra fields on line of element
2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab
reset function2.lib.php to orign
2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10
Add complete head into agenda
2014-01-29 10:11:39 +01:00
Florian Henry
ca556485e0
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-29 10:09:44 +01:00
Laurent Destailleur
ebd8d5f8dd
New: Can input barcode during product creation step.
2014-01-28 19:11:22 +01:00
Laurent Destailleur
7c01fd98b3
Fix: use allowed database types
2014-01-28 15:45:00 +01:00
Laurent Destailleur
1ec53873f3
Fix: Missing date start and end when creating contracts
2014-01-28 15:28:23 +01:00
Laurent Destailleur
5657bd7793
New: Can create contract from an order.
2014-01-28 15:26:20 +01:00
Laurent Destailleur
954cd74ffb
Fix: Missing date start and end when creating contracts
2014-01-28 15:24:30 +01:00
Laurent Destailleur
0d0fda8fae
Merge pull request #1382 from atm-geoffrey/develop
...
Add new doActions and formObjectOptions hook on supplier prices page
2014-01-27 01:43:08 -08:00
Alexis Algoud
b2477b6764
Regression in contact form on Note field
...
It's seems to be a regression to Note field in 3.3 instead of public and private Note introduced in 3.4 (and confirmed in the class -> Note / / deprecated)
2014-01-27 10:36:59 +01:00
Laurent Destailleur
3efd44fd28
Fix: Enabled in dev mode only
2014-01-26 23:23:36 +01:00
Laurent Destailleur
9cf745b127
Sync with transifex
2014-01-26 23:12:25 +01:00
Laurent Destailleur
0d01155453
Fix: Bad translation
2014-01-26 21:01:32 +01:00
Laurent Destailleur
ee41273286
Fix: Count of files were wrong
2014-01-26 19:27:42 +01:00
Laurent Destailleur
cd277aaf12
Fix: Missing translation
2014-01-26 19:10:05 +01:00
Laurent Destailleur
f83b47be9f
Fix: Missing loading lang files.
2014-01-26 18:43:30 +01:00
Laurent Destailleur
557fb0a9b1
Fix: miscellaneous css problems
...
Fix: Version was missing into home page when login was already done.
2014-01-26 18:30:45 +01:00
Laurent Destailleur
549f5c8426
Fix: Not existing file
2014-01-26 17:01:14 +01:00
Laurent Destailleur
1bdeb171c7
Fix: Missing class
2014-01-26 01:33:16 +01:00
Laurent Destailleur
f50ad96beb
Fix: var init at wrong place
2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a
Fix: var init at wrong place
2014-01-25 23:14:25 +01:00
Laurent Destailleur
0a367f03a0
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-25 16:29:19 +01:00
Laurent Destailleur
7149fd76c7
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2014-01-25 16:28:21 +01:00
Laurent Destailleur
98805ace4a
Fix: Error management when deleting a payment on supplier invoice.
2014-01-25 00:30:03 +01:00
Laurent Destailleur
7986c95ce3
Fix: Error management when deleting a payment on supplier invoice.
2014-01-25 00:26:42 +01:00
Laurent Destailleur
372acbfb0d
Fix: Error management when deleting a payment on supplier invoice.
2014-01-25 00:25:42 +01:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d
Fix: doxygen errors
2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8
Merge pull request #1381 from altairis-fr/clonepropal
...
clone of propal improvements
2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-24 10:20:03 +01:00
Laurent Destailleur
7254aecbb7
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-23 20:03:25 +01:00
Laurent Destailleur
21b43d7604
Fix: if module invoice is disabled, option to automatically classify
...
order as billed does not exists, so "Classify billed" for order must be
done manually from order card.
2014-01-23 20:02:19 +01:00
simnandez
714be2cd62
Trad: Add missing ca_ES and es_ES files
2014-01-23 17:05:51 +01:00
simnandez
21d6e22f03
Trad: Add missing ca_ES and es_ES files
2014-01-23 17:05:07 +01:00
simnandez
a059b66b7d
Fix: box of bank balances lines without decimals
2014-01-23 16:27:34 +01:00
simnandez
6fed307d70
Fix: box of bank balances lines without decimals
2014-01-23 16:26:07 +01:00
simnandez
72752f9a30
Fix: Bad navigation into stock product tab
2014-01-23 16:01:27 +01:00
simnandez
cd1313280c
Fix: Bad navigation into stock product tab
2014-01-23 16:00:15 +01:00
Grand Philippe
2f2668d41f
typo
2014-01-23 12:25:25 +01:00
Juanjo Menent
f634427f73
Merge pull request #1390 from grandoc/3.5
...
typo
2014-01-23 03:22:57 -08:00
simnandez
2866deb3c4
Thousand separator must be space into Spain
2014-01-23 12:18:57 +01:00
simnandez
35051f8c77
Thousand separator must be space into Spain
2014-01-23 12:18:15 +01:00
Maxime Kohlhaas
db90776400
Thousand separator has been set to None instead of space
2014-01-23 12:16:38 +01:00
Juanjo Menent
4c64767e7b
Merge pull request #1392 from atm-maxime/3.5
...
Thousand separator has been set to None instead of space
2014-01-23 03:14:57 -08:00
Laurent Destailleur
ce24a7e9ad
Fix: Bad error management making rollback instead of commit
2014-01-23 09:20:06 +01:00
Laurent Destailleur
9e7f3686db
Fix: No message if module mailman disabled
2014-01-23 09:19:56 +01:00
Laurent Destailleur
5cfaca4942
Fix: Bad error management making rollback instead of commit
2014-01-23 09:19:15 +01:00
Maxime Kohlhaas
4f5441dc81
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
2014-01-23 09:07:48 +01:00
Maxime Kohlhaas
eb7d802a8f
Thousand separator has been set to None instead of space
2014-01-23 09:07:15 +01:00
Laurent Destailleur
82bc9e709b
Fix: No message if module mailman disabled
2014-01-23 08:54:39 +01:00
geoffrey.girard
7f59def98b
Correction trigger on update product buyprice
2014-01-22 10:44:23 +01:00
philippe
021f6e90e2
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-22 08:09:44 +01:00
Laurent Destailleur
9341db3e86
Fix: Missing id
2014-01-22 03:20:18 +01:00
Grand Philippe
8a0bddf4c5
typo
2014-01-21 18:55:45 +01:00
Christophe Battarel
81bae5fff9
fix wrong constant usage
2014-01-21 18:33:25 +01:00
Laurent Destailleur
8666524446
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-21 15:28:18 +01:00
Laurent Destailleur
8cdd0502b7
Fix: Syntax error
2014-01-21 15:27:32 +01:00
Florian Henry
a7c892e23b
Fix Mask numbering
2014-01-21 14:18:00 +01:00
Laurent Destailleur
f3774cc5e1
Merge pull request #1385 from defrance69/patch-24
...
Update fournisseur.class.php
2014-01-21 05:05:20 -08:00
Laurent Destailleur
b8aee5f462
Merge pull request #1388 from FHenry/3.4
...
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with date 2014-01-01)
2014-01-21 04:59:43 -08:00
Florian Henry
cd84a5fd17
remove debug
2014-01-21 13:48:47 +01:00
Florian Henry
79c2e31439
Fix mask
2014-01-21 13:47:48 +01:00
Laurent Destailleur
2c0c3ce241
Merge pull request #1383 from atm-maxime/develop
...
Allow to clone an invoice on a different third
2014-01-21 04:46:18 -08:00
Laurent Destailleur
3852fe4a1c
Merge pull request #1380 from atm-alexis/3.5
...
Add right to export project in export tool
2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-01-21 13:23:27 +01:00
Léo
46926aa685
Fix: modBarcode issue with blank list in conf (?)
...
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 13:19:32 +01:00
Laurent Destailleur
d7e111b3bd
Fix: Missing parent tables
2014-01-21 13:18:30 +01:00
Laurent Destailleur
8bd2a1bc32
Merge pull request #1384 from Pfontaine/fix/societe2contact_civilite
...
Fix: add civilite_id field in contact when create new third party.
2014-01-21 04:12:47 -08:00
Laurent Destailleur
709edca05c
Merge pull request #1386 from zongap/patch-1
...
Fix: modBarcode issue with blank list in conf (?)
2014-01-21 04:11:32 -08:00
Florian Henry
163fcc8179
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-21 12:58:47 +01:00
Florian Henry
398e286be9
Fix reset Mask (befor do not work with FA{yy}{mm}-{0000@99} and date
...
2014-01-01)
2014-01-21 12:58:25 +01:00
Florian Henry
57f8f30494
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with
...
date 2014-01-01)
2014-01-21 12:57:32 +01:00
Laurent Destailleur
23e6709164
Better error message
2014-01-21 12:55:05 +01:00
Laurent Destailleur
cfd8601a70
Fix: Missing parent tables
2014-01-21 12:53:27 +01:00
Maxime Kohlhaas
60e616f63e
Fix : big bug while importing thirds, codes were not properly set or not imported
2014-01-21 10:29:35 +01:00
Maxime Kohlhaas
06bbc48399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-01-21 09:03:25 +01:00
Léo
6c00fc33f2
Fix: modBarcode issue with blank list in conf (?)
...
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 00:54:26 +01:00
Laurent Destailleur
e85cf332b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f
New: Can call back barcode number from a product ref or thirdparty ref.
2014-01-20 17:18:56 +01:00
Laurent Destailleur
30aae38efa
Removed POST usage.
2014-01-20 14:23:37 +01:00
Laurent Destailleur
70debe9d9f
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-20 11:25:58 +01:00
Laurent Destailleur
5b6b8f1d5b
Fix: Support for reset everymonth (@99 into numbering mask) was ko when
...
changing year.
2014-01-20 11:20:38 +01:00
Laurent Destailleur
8d8e016115
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
Laurent Destailleur
8642e2027c
Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal
...
vulnerability
2014-01-20 02:10:16 +01:00
Laurent Destailleur
0ba82d3c6e
Fix: Missing test on id
2014-01-20 01:27:40 +01:00
Laurent Destailleur
1ebd56c4ee
New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE
2014-01-20 00:40:01 +01:00
Laurent Destailleur
699a079ed7
New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and
...
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
2014-01-20 00:31:32 +01:00
Laurent Destailleur
73be349233
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-19 23:47:58 +01:00
Laurent Destailleur
5f58bff981
Use _ instead of - for option SUPPLIER_REF_IN_NAME
2014-01-19 22:59:37 +01:00
Laurent Destailleur
6253385b17
Fix: Thumbs was not visible when file was uploaded with extension in
...
upper case.
2014-01-19 22:51:24 +01:00
Laurent Destailleur
123cd787f5
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-19 22:44:34 +01:00
Laurent Destailleur
79e4c283db
Fix: Deletion of files was broken
2014-01-19 22:43:36 +01:00
Laurent Destailleur
cbf6e8563d
New: Add option SUPPLIER_REF_IN_NAME
2014-01-19 22:00:02 +01:00
Laurent Destailleur
becd65f9d3
Fix: Bad space into log
2014-01-19 21:34:48 +01:00
BENKE Charles
0d80d9331f
Update fournisseur.class.php
...
wrong object
2014-01-19 15:44:58 +01:00
Peter Fontaine
919a7cd4a6
Fix: add civilite_id field in contact when create new third party.
2014-01-19 14:21:11 +01:00
Laurent Destailleur
c7a73e4e00
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36
Fix: Missing the version into url
2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Laurent Destailleur
4074547589
Fix;: Pb of caching static resource (js and css). Add a workaround to
...
avoid any problems.
2014-01-18 00:50:21 +01:00
Maxime Kohlhaas
7e8a7f7e7f
Allow to clone an invoice on a different third
2014-01-17 15:44:06 +01:00
geoffrey.girard
8729790016
Add trigger on update product buyprice
2014-01-17 10:38:18 +01:00
geoffrey.girard
e418e10df0
Add new doActions hook on supplier prices page
2014-01-17 09:45:57 +01:00
Laurent Destailleur
031fd2f8b8
Fix: No set focus
2014-01-17 03:25:31 +01:00
Christophe Battarel
7d04944ca7
don't reset ref_client if same customer and MAIN_KEEP_REF_CUSTOMER_ON_CLONING
2014-01-16 11:48:48 +01:00
Christophe Battarel
687fc1798b
on clone of propal, copy contact informations
2014-01-16 11:43:59 +01:00
Christophe Battarel
0bdcd108f5
Add supplier informations in product export (supplier name, supplier product ref and supplier unit price)
2014-01-16 11:04:56 +01:00
Laurent Destailleur
c5bcc92651
Rename tag note to differentiate public and private note
2014-01-16 00:07:45 +01:00
Laurent Destailleur
b3229a4021
Qual: Add error message if using wrong parameter into upgrade.php script
...
First try to test migration into travis.
2014-01-15 19:23:33 +01:00
Laurent Destailleur
d72167d543
Code comments
2014-01-15 19:12:55 +01:00
Laurent Destailleur
aa69927089
Move table title nowrap tag at a better place.
2014-01-15 18:35:15 +01:00
Laurent Destailleur
ad5fc43e5b
doxygen
2014-01-15 18:20:24 +01:00
Laurent Destailleur
b5620d5f15
New: The box "balance of bank accounts" show all opened accounts.
2014-01-15 17:52:16 +01:00
Laurent Destailleur
fce9baddf0
New: Add substitution key into emailing module to include securitykey
...
used for paypal links into email.
2014-01-15 17:21:13 +01:00
Laurent Destailleur
6a95f73036
Fix: Missing translation key
2014-01-15 16:14:34 +01:00
Laurent Destailleur
af4d48aec0
Fix: If end date is not defined, we can't say it is too late.
2014-01-15 15:42:14 +01:00
Alexis Algoud
9a5b46330a
Add right to export project in export tool
...
As the right does not exist, the tool could never be exploited
2014-01-15 14:49:22 +01:00
Laurent Destailleur
b9be26f9f1
Fix: favicon was old file.
...
Fix: missing favicon for theme auguria
2014-01-15 09:24:53 +01:00
Laurent Destailleur
fed3ac9b70
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2014-01-15 09:10:30 +01:00
Laurent Destailleur
8de8e9d886
Fix: reference to a file that does not exists
2014-01-15 09:09:52 +01:00
Laurent Destailleur
0725fea923
Fix: doxygen
2014-01-15 03:08:11 +01:00
Laurent Destailleur
ac45051b53
Fix: Showing version is wrong when replace by external module
2014-01-15 02:04:44 +01:00
Laurent Destailleur
fa1c88d80b
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-01-14 22:18:57 +01:00
Laurent Destailleur
4f1df33e51
Fix: thumb image was not up to date compared to new skin.
2014-01-14 22:18:44 +01:00
Laurent Destailleur
3a246bdca9
Merge pull request #1377 from csalvador/containsObject
...
add a method to check for the presence of an object in a category
2014-01-14 09:11:47 -08:00
Laurent Destailleur
12ee5dece2
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-14 18:10:14 +01:00
Cedric GROSS
6d4a9833e2
Fix bug on stock calculation for replenishment: wrong order in ifsql.
2014-01-14 18:08:26 +01:00
Laurent Destailleur
c704182b4d
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2014-01-14 18:01:39 +01:00
Laurent Destailleur
bd1a10c116
Fix: doxygen
2014-01-14 16:49:06 +01:00
Cedric GROSS
911c43c862
Fix bug on stock calculation for replenishment: wrong order in ifsql.
2014-01-13 19:46:23 +01:00
Grand Philippe
b61ccb8234
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:15:07 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 09:43:21 +01:00
Cédric Salvador
ecfff5636b
rename is_in_cat to containsObject
2014-01-13 09:27:10 +01:00
Cédric Salvador
abe76708de
renamed object_exists
2014-01-13 09:06:00 +01:00
Cédric Salvador
e7f7dd49a5
add a method to check for the presence of an object in a category
2014-01-13 09:06:00 +01:00
philippe
9bada81b63
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-13 08:47:57 +01:00
Laurent Destailleur
795dcad59f
Fix: The login page should have same code than standard page using
...
common footer.
2014-01-12 22:26:48 +01:00
Grand Philippe
938f31f383
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1.
2014-01-12 21:45:52 +01:00
philippe
d2d84c3e48
Fix: path to image must not be hardcoded but use dol_buildpath or
...
img_picto with param src=1.
2014-01-12 21:26:44 +01:00
Laurent Destailleur
5f65b2a97f
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-12 20:23:24 +01:00
Laurent Destailleur
0f329e72ef
Fix: MAIN_FORCETHEME was not working when user set its own theme
2014-01-12 20:22:35 +01:00
Laurent Destailleur
4d298b1891
Update code comments and add log warning to help debug
2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961
Update code comments and add log warning to help debug
2014-01-12 20:02:41 +01:00
Laurent Destailleur
ffeb2778e5
Fix: path to image must not be hardcoded but use dol_buildpath or
...
img_picto with param src=1.
2014-01-12 19:23:36 +01:00
Laurent Destailleur
51b455b85a
Start to normalize code for category to not use named table, columns but
...
only type of category.
2014-01-12 15:54:28 +01:00
Laurent Destailleur
1cf058b8e9
Bad comment
2014-01-12 15:12:25 +01:00
BENKE Charles
28204d66b1
Update modFacture.class.php
...
remplace price by subprice on export invoice
2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd
Merge pull request #1372 from defrance69/patch-23
...
Update modFacture.class.php
2014-01-12 05:58:04 -08:00
Laurent Destailleur
06aa3b8250
Merge branch 'opensurvey-improvements' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements
Conflicts:
ChangeLog
2014-01-12 14:50:00 +01:00
Laurent Destailleur
02989b9f32
New: An external module can add tabs with a label that is a dynamic
...
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
2014-01-12 14:11:03 +01:00
Raphaël Doursenaud
78b40eaa8c
Handle default session path nicely
2014-01-11 17:30:29 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
171e74ae7e
Reduce time to hide/show
2014-01-11 13:31:12 +01:00
Laurent Destailleur
db5fe44b93
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2014-01-10 16:48:56 +01:00
BENKE Charles
dd3da37ce6
Update modFacture.class.php
...
remplace price by subprice on export invoice
2014-01-10 10:35:42 +01:00
Laurent Destailleur
5bdd7fc074
Fix: Doxygen
2014-01-10 03:39:43 +01:00
Laurent Destailleur
45b3a02e8b
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-01-10 01:37:58 +01:00
Laurent Destailleur
2c310e26a6
Fix: Missing lang file
2014-01-10 01:37:41 +01:00
Laurent Destailleur
9b9492a5d6
New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to
...
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
2014-01-10 01:31:23 +01:00
Laurent Destailleur
c3da8ca80a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-01-10 01:25:55 +01:00
Laurent Destailleur
7809e0baa9
Fix: dol_htmlentitiesbr behaviour was different if input was html
...
or not. Add phpunit test to avoid that in future.
2014-01-10 01:25:28 +01:00
Laurent Destailleur
7b63ce1f31
Doxygen
2014-01-10 00:57:17 +01:00
Laurent Destailleur
374be1854e
Fix: Bad url
2014-01-09 23:12:28 +01:00
Laurent Destailleur
eae92695d6
Fix: Warning into bank conciliation feature.
2014-01-09 18:47:33 +01:00
Maxime Kohlhaas
364085bd20
Fix : wrong var used in bank account class
2014-01-09 18:42:35 +01:00
Laurent Destailleur
0b071ac4f1
Merge pull request #1369 from jfefe/fix_extrafield_list
...
Fix : when using several field for label into sellist extrafields
2014-01-09 06:41:27 -08:00
Laurent Destailleur
08e4dc29de
Merge pull request #1370 from jfefe/ajax_extralist
...
New : ajax list for extrafields list and sellist
2014-01-09 06:39:22 -08:00
Laurent Destailleur
dce76609e3
Merge pull request #1365 from marcosgdf/translation
...
Added missing translation key
2014-01-09 06:33:02 -08:00
Laurent Destailleur
433a6c0e76
Merge pull request #1364 from marcosgdf/xss-title
...
Fixed XSS problem in title tag
2014-01-09 06:32:35 -08:00
Laurent Destailleur
d76f54757b
Merge pull request #1367 from camlafit/odt2pdf
...
Small improves on odt2pdf script
2014-01-09 06:31:35 -08:00
Laurent Destailleur
511a44a7e6
Merge pull request #1368 from csalvador/webservices-debug
...
fixed wrong thumbnails directory
2014-01-09 06:28:53 -08:00
Laurent Destailleur
2b4f0bd4b1
Fix: Add a limit into list to avoid browser to hang when database is too
...
large.
2014-01-09 14:28:32 +01:00
Cédric Salvador
e959568a1d
Added details to the contact created by create_individual
2014-01-09 09:10:50 +01:00
jfefe
77a1d6a43a
Bad value display when using several label into sellist extrafield
2014-01-09 02:40:34 +01:00
jfefe
f554464690
New : ajax list for extrafields list and sellist
2014-01-09 02:10:03 +01:00
jfefe
f1d1522478
Fix : when using several field for label into sellist extrafields traduction is not needed.
...
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
2014-01-09 01:49:59 +01:00
Laurent Destailleur
63ecb859d6
Fix: Missing alias befofe field into sql request and removed bad join on
...
table making some record to disappear.
2014-01-08 20:50:04 +01:00
Laurent Destailleur
855487a384
Fix: Missing alias befofe field into sql request and removed bad join on
...
table making some record to disappear.
2014-01-08 20:40:30 +01:00
Laurent Destailleur
fac3593f7c
Missing lang file
2014-01-08 15:50:11 +01:00
Laurent Destailleur
c0c555b78f
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-08 15:16:56 +01:00
Laurent Destailleur
622fe72abf
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
2014-01-08 15:13:41 +01:00
Laurent Destailleur
6ff337ccad
New: Add option 'aZ' into GETPOST function to check parameters
...
contains only a to z or A to Z characters.
2014-01-08 00:10:39 +01:00
Laurent Destailleur
77cfdfd59e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-01-08 00:05:59 +01:00
Laurent Destailleur
5f15dcded7
New: Work on a basic print barcode page
2014-01-08 00:05:42 +01:00
Laurent Destailleur
0e3757aa5c
New: Add option 'az' into GETPOST
2014-01-08 00:05:14 +01:00
Laurent Destailleur
bc51065ff1
New: For paypal payment confirmation, send email ok only if payment is
...
confirmed. Otherwise send ko email.
2014-01-07 17:35:33 +01:00
Laurent Destailleur
58bc3b1457
New: For paypal payment confirmation, send email ok only if payment is
...
confirmed. Otherwise send ko email.
2014-01-07 17:34:25 +01:00
Cédric Salvador
68e42bc24e
fixed wrong thumbnails directory
2014-01-07 17:26:12 +01:00
Laurent Destailleur
267716b557
Just a space between default message and setup message
2014-01-07 16:53:07 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
6e5f3b8bdd
Fix: entity into public pages not set at correct place
2014-01-07 16:29:25 +01:00
Laurent Destailleur
1df18f1e93
Fix: Function GETPOST not found
2014-01-07 16:11:08 +01:00
Laurent Destailleur
4d379e572a
Fix: Bugs into permissions for module category
2014-01-07 15:35:26 +01:00
Laurent Destailleur
bbeff884f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-07 15:12:53 +01:00
Laurent Destailleur
89c772459f
Fix: Bugs into permissions for module category
2014-01-07 14:55:03 +01:00
simnandez
035670dce3
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:18:50 +01:00
simnandez
b8550bb985
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:16:56 +01:00
simnandez
d4db5916f0
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:16:16 +01:00
cam.lafit
1229842dc6
Provide a new constant about odt2pdf mangement : Don't remove odt source
...
* MAIN_ODT_AS_PDF_DEL_SOURCE by default disable
* If set then initial behaviour is conserved, odt file is removed
2014-01-06 20:07:15 +01:00
Laurent Destailleur
e99883f1a6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/admin/modules.php
2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2014-01-06 19:13:40 +01:00
Laurent Destailleur
ab7a17fe73
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-01-06 19:12:06 +01:00
Laurent Destailleur
0e3184c436
Fix: W3C.
...
Fix: Permission on a button.
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/soc.php
Fix: Some menu entry not visible.
2014-01-06 17:17:57 +01:00
Laurent Destailleur
555170e573
Fix: W3C.
...
Fix: Permission on a button.
Fix: Some menu entry not visible.
2014-01-06 17:14:13 +01:00
Laurent Destailleur
7fd34e5ff6
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
2014-01-06 12:42:50 +01:00
Marcos García de La Fuente
2a41a29306
Fixed bad translation
2014-01-06 06:05:30 +01:00
Marcos García de La Fuente
0622fc4ffd
Added missing translation key
2014-01-06 06:03:26 +01:00
Marcos García de La Fuente
fc7d3d4771
Modified migration script to not remove columns
2014-01-06 05:39:22 +01:00
Marcos García de La Fuente
55014b3338
If user does not have an email and option “Mailsonde” is active, then we show a warning
2014-01-06 05:29:07 +01:00
Marcos García de La Fuente
2c816e09a5
If no spy option is enabled, users should not now which is the most voted option
2014-01-06 05:20:08 +01:00
Marcos García de La Fuente
c245e86b60
Little changes to the opensurvey_sondage table definition
2014-01-06 05:17:02 +01:00
Marcos García de La Fuente
c2c97ec82a
Mailsonde should not be a varchar
2014-01-06 05:12:47 +01:00
Marcos García de La Fuente
e09af20899
Removed unused translations from opensurvey.lang
2014-01-06 05:09:36 +01:00
Marcos García de La Fuente
dafe05d15d
Fixed a problem with open survey creation trigger
2014-01-06 05:09:17 +01:00
Marcos García de La Fuente
e0c7eb545c
Email and poll author are now retrieved from the logged user
2014-01-06 05:08:42 +01:00
Marcos García de La Fuente
b8b7dbbed4
Created triggers OPENSURVEY_CREATE and OPENSURVEY_DELETE
2014-01-05 22:05:56 +01:00
Marcos García de La Fuente
ff7e4e49f3
Limiting the voting time of the survey
2014-01-05 21:54:12 +01:00
Marcos García de La Fuente
aa25d2cb81
End date of the survey was altered when creating a new column in date poll format
2014-01-05 21:23:00 +01:00
Marcos García de La Fuente
45aa6767e0
Return back to the results page when a new column is created
2014-01-05 21:20:08 +01:00
Marcos García de La Fuente
e7d2765fc6
Replaced use of htmlentities with dol_htmlentities
2014-01-05 21:08:37 +01:00
Marcos García de La Fuente
b12b7d965a
Fixed “cancel” button on creation in new column of standard poll type
2014-01-05 21:00:54 +01:00
Marcos García de La Fuente
224208c9bb
Unified comment deletion in Opensurveysondage::deleteComment
2014-01-05 20:58:27 +01:00
Marcos García de La Fuente
1e6c0c0b1a
There is no poll format A+ or D+
2014-01-05 20:48:20 +01:00
Marcos García de La Fuente
291267953a
Added a new check to don’t allow users create standard polls without any option
2014-01-05 20:46:45 +01:00
Marcos García de La Fuente
a158067150
Improved error feedback when empty required inputs are submitted
2014-01-05 20:39:53 +01:00
Marcos García de La Fuente
60cff505a7
Fixed always-checked mail when a new person votes feature
2014-01-05 20:36:40 +01:00
Marcos García de La Fuente
1afdce2c16
Cancel button when adding a new poll column was not working
2014-01-05 20:34:43 +01:00
Marcos García de La Fuente
e493348931
Removed space before colon
2014-01-05 20:30:53 +01:00
Marcos García de La Fuente
ef44db8bd8
Removed unused constants & functions and added new comment insert error message
2014-01-05 20:28:32 +01:00
Marcos García de La Fuente
b68f5b6251
Removed unexisting input checks
2014-01-05 20:21:06 +01:00
Marcos García de La Fuente
0f08fd3f06
Replaced usage of htmlentities with dol_htmlentities
2014-01-05 20:18:02 +01:00
Marcos García de La Fuente
b32fafef17
Fixed problem with visualization of previous votes in poll voting page
2014-01-05 20:10:39 +01:00
Marcos García de La Fuente
c891f4afc4
Fixed coding standard problems
2014-01-05 19:40:49 +01:00
Marcos García de La Fuente
f7809906d9
Removed massive deletion feature of polls as it is not a common case
2014-01-05 19:38:39 +01:00
Marcos García de La Fuente
f5201b97a5
The voter does not have to know which user created the poll
2014-01-05 19:15:48 +01:00
Marcos García de La Fuente
0a3a6c0f88
Restricted survey creation to $user->rights->opensurvey->write
2014-01-05 19:13:12 +01:00
Marcos García de La Fuente
048e270fec
Removed odd html attributes
2014-01-05 19:09:20 +01:00
Marcos García de La Fuente
044d81b0a5
Removed unused images
2014-01-05 19:09:03 +01:00
Marcos García de La Fuente
2393e7c732
Moved creation poll wizard out of public folder
2014-01-05 19:03:33 +01:00
Marcos García de La Fuente
a5a0962dab
Fixed JS errors and little style changes
2014-01-05 18:55:56 +01:00
Marcos García de La Fuente
4cdafba7a2
Removed “origin” input use in poll creation
2014-01-05 18:49:49 +01:00
Marcos García de La Fuente
adcc4090b0
Removed “today” button of expire date input in poll creation form
2014-01-05 18:46:04 +01:00
Marcos García de La Fuente
33ec281424
Removed unexisting input checks in poll creation
2014-01-05 18:44:19 +01:00
Marcos García de La Fuente
acd847c419
Fixed SQL error in opensurvey poll list
2014-01-05 18:42:30 +01:00
Marcos García de La Fuente
832fc8e0f3
Renamed NextStep button to CreatePoll
2014-01-05 18:42:08 +01:00
Marcos García de La Fuente
97bd5df498
Moved poll expiration date to first form and removed odd forms
2014-01-05 18:40:53 +01:00
Laurent Destailleur
2d8214a940
Fix: The delete button into ecm module does not work when ajax disabled.
2014-01-05 18:37:26 +01:00
Laurent Destailleur
5b40eff0fa
Fix: W3C. Input fields can be between a table and tr tag.
2014-01-05 18:30:35 +01:00
Laurent Destailleur
667908baf8
Fix: Missing lang loading
2014-01-05 16:37:33 +01:00
Laurent Destailleur
283297294b
Fix: Missing definition of status labels
2014-01-05 16:19:25 +01:00
Laurent Destailleur
48973c6d02
Fix: Some SQL requests were not finished into new tab "consumption".
2014-01-05 16:00:45 +01:00
Laurent Destailleur
9a6f22a86e
Fix: W3C no form into table.
...
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
67220a15ca
Fix: Bad translation key
2014-01-05 14:13:40 +01:00
Marcos García de La Fuente
4f57e82975
Removed odd messages
2014-01-05 09:36:35 +01:00
Marcos García de La Fuente
8d96675607
Force logged user to create surveys and applied Dolibarr style to poll creation wizard
2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
c86130e813
Fixed navigation arrows in poll card
2014-01-05 08:03:50 +01:00
Marcos García de La Fuente
fba3c63050
Starting to make survey creation a user-only access page
2014-01-05 07:28:04 +01:00
Marcos García de La Fuente
f8268c60d4
Removed OpenSurvey legend from public poll voting page
2014-01-05 07:16:36 +01:00
Marcos García de La Fuente
cf092834cd
Renamed some file names from french to english
2014-01-05 07:08:37 +01:00
Marcos García de La Fuente
08560cbc5f
Little spacing improvement
2014-01-05 07:05:04 +01:00
Marcos García de La Fuente
b2c0463cd9
Corrected little problem with XSS fix
2014-01-05 07:03:51 +01:00
Marcos García de La Fuente
abf0ec1d6a
Removed unnecesary form ID
2014-01-05 06:59:38 +01:00
Marcos García de La Fuente
b699133357
Restricting deletion of polls in poll list
2014-01-05 06:50:56 +01:00
Marcos García de La Fuente
eb43a70b26
Renamed SurveyResults/Preview tab to SurveyResults as it didn’t make sense to make a “preview” of a public page
2014-01-05 06:45:53 +01:00
Marcos García de La Fuente
d76081d487
Improved feedback to the user when he did not enter name in his vote
2014-01-05 06:42:08 +01:00
Marcos García de La Fuente
67077338a0
Improved translation of opensurvey module
2014-01-05 06:37:08 +01:00
Marcos García de La Fuente
426ccb4056
Fixed another XSS in public poll vote page
2014-01-05 06:25:47 +01:00
Marcos García de La Fuente
6397b0b7aa
Improving the use of permissions in opensurvey module
2014-01-05 06:18:26 +01:00
Marcos García de La Fuente
12c5a2c201
Fixed more XSS problems in opensurvey module
2014-01-05 05:27:15 +01:00
Marcos García de La Fuente
a8a2613c4a
Date combo selector wasn’t translating month names
2014-01-05 05:25:32 +01:00
Marcos García de La Fuente
89c6aa2d87
Removed unused/unuseful injection checks on open survey creation
2014-01-05 05:04:41 +01:00
Marcos García de La Fuente
dd8d8e8e42
Removed unused translation strings
2014-01-05 04:59:15 +01:00
Marcos García de La Fuente
e49f94d02e
Fixed XSS problem in title tag
2014-01-05 04:52:45 +01:00
Marcos García de La Fuente
d23a8ea788
Fixed big XSS problems in open survey module
2014-01-05 04:50:54 +01:00
Marcos García de La Fuente
45da8eb446
Fixed fatal error when deleting a poll
2014-01-05 04:50:37 +01:00
Laurent Destailleur
5a7fe6b4a7
Fix: Change to make debian package ok despite removal of ckeditor
...
package.
2014-01-05 01:17:38 +01:00
Marcos García de La Fuente
7fccefd620
Fixed code quality problem
2014-01-04 20:05:18 +01:00
Marcos García de La Fuente
c9db0c3a94
Removed “stupid” feature to allow voters edit other users’ vote
2014-01-04 19:51:44 +01:00
Laurent Destailleur
d2d0d715a9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/install/mysql/data/llx_c_tva.sql
2014-01-04 19:02:56 +01:00
Laurent Destailleur
f1120b8749
Merge pull request #1363 from atm-alexis/3.4
...
New standard VAT rate for France on january, 1st, 2014
2014-01-04 09:59:59 -08:00
Laurent Destailleur
2ee5076970
Problem of key of language into auguria menu
2014-01-04 18:57:57 +01:00
Laurent Destailleur
77e2d49658
Merge pull request #1358 from marcosgdf/payment_menu
...
Fixed quality control checks for PR #1357
2014-01-04 09:45:12 -08:00
Marcos García de La Fuente
c197fbd436
Removed unused images
2014-01-04 18:01:55 +01:00
Marcos García de La Fuente
a40286f2fc
Added missing function comment
2014-01-04 17:17:25 +01:00
Laurent Destailleur
ee1e7471ff
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
2014-01-04 16:13:34 +01:00
Marcos García de La Fuente
11dc75686f
Mailsonde Opensurvey function can now be modified
2014-01-04 15:57:07 +01:00
Marcos García de La Fuente
57a18ba4af
Unified duplicate code that cleaned Opensurveysondage parameters into Opensurveysondage::cleanParameters
2014-01-04 15:56:37 +01:00
Marcos García de La Fuente
efba39310e
Some session variables were not properly unset
2014-01-04 15:47:47 +01:00
Marcos García de La Fuente
3590e3d7b6
Moved creation of surveys to the function Opensurveysondage::create
2014-01-04 15:42:44 +01:00
Laurent Destailleur
f6cda9deb6
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d
New: Add menu entry to barcode genration page.
2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
b9ec6ad637
Removed unused function opensurveysondage::createFromClone
2014-01-03 23:58:44 +01:00
Marcos García de La Fuente
13d4ea4c38
Added a new feature to disable spying other users’ vote
2014-01-03 23:30:15 +01:00
Marcos García de La Fuente
2b01981213
There is no rowid in llx_opensurvey_sondage table
2014-01-03 22:29:40 +01:00
Marcos García de La Fuente
1a038fac06
Removed the use of id_sondage_admin and survey_link_visible fields of llx_opensurvey_sondage
2014-01-03 22:13:15 +01:00
Laurent Destailleur
f0503dfaa9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/compta/stats/cabyprodserv.php
htdocs/compta/stats/casoc.php
2014-01-03 18:28:00 +01:00
Laurent Destailleur
d992d5cb22
Fix: Bad SQL request when using filter on category.
2014-01-03 18:16:21 +01:00
Marcos García de La Fuente
a5b9122e98
Allow to disable poll comments
2014-01-03 17:44:42 +01:00
Marcos García de La Fuente
8b781e46c6
Added missing copyright info
2014-01-03 16:43:34 +01:00
Marcos García de La Fuente
8727daeb77
Unified comment addition in OpenSurveySondage::addComment and removed duplicate code
2014-01-03 16:38:02 +01:00
Marcos García de La Fuente
cf3ac246bf
Moved exportcsv.php out of public folder as it should only be accesible for Dolibarr users
2014-01-03 15:35:12 +01:00
Marcos García de La Fuente
e0dd3d5bc9
Added missing copyright info
2014-01-03 15:31:29 +01:00
Marcos García de La Fuente
dd7be996c2
Improved translation of opensurvey module
2014-01-03 15:27:26 +01:00
Marcos García de La Fuente
32ca1b8881
Corrected broken links
2014-01-03 14:59:59 +01:00
Marcos García de La Fuente
7a1af8656a
Removed duplicate code
2014-01-03 14:52:31 +01:00
Marcos García de La Fuente
2e995fc20b
Unwanted removal of query filter in poll card
2014-01-03 14:42:39 +01:00
Marcos García de La Fuente
05ab8334ef
Missing copyright info
2014-01-03 14:00:48 +01:00
Marcos García de La Fuente
93fb104077
Image alternative text was empty in creation page of surveys
2014-01-03 13:59:57 +01:00
Marcos García de La Fuente
6965d88cb5
Removed unused global vars in function llxHeaderSurvey
2014-01-03 13:59:30 +01:00
Marcos García de La Fuente
0b55181776
Little changes to improve listing of surveys
2014-01-03 13:59:13 +01:00
Alexis Algoud
68893b205c
New standard VAT rate for France on january, 1st, 2014
2014-01-03 09:58:01 +01:00
Marcos García de La Fuente
694fd5810a
Removed unuseful opensurvey admin page
2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
build/debian/changelog
2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096
Fix: doxygen
2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
2014-01-02 20:45:59 +01:00
Marcos García de La Fuente
44ab26698e
Fixed (again) quality code control checks
2014-01-02 16:41:23 +01:00
Marcos García de La Fuente
5f3d2aea51
Opensurvey polls tab cards can now be extended from external modules
2014-01-02 16:32:48 +01:00
Marcos García de La Fuente
048ea8062a
Modified GET param of poll id to accept standard ID
2014-01-02 16:32:11 +01:00
Marcos García de La Fuente
c35a704875
Printing opensurveysondage.class.php error instead of a non-translated error
2014-01-02 15:54:17 +01:00
Marcos García de La Fuente
3d1a980f2d
Logging error when no poll was found in opensurveysondage.class.php
2014-01-02 15:49:49 +01:00
Laurent Destailleur
504b519fb7
Fix: Bad link for download file into documents page of supplier invoices
2014-01-01 18:37:06 +01:00
Laurent Destailleur
5fd47b34b0
Fix: Bad link for download file into documents page of supplier invoices
2014-01-01 18:30:32 +01:00
Laurent Destailleur
0bdcda50c6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
build/pad/pad_dolibarr.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094
Prepare 3.5.0 release
2013-12-31 15:17:10 +01:00
Laurent Destailleur
eadccb5d9b
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/langs/bg_BG/main.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/margins.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/lv_LV/admin.lang
htdocs/langs/lv_LV/agenda.lang
htdocs/langs/lv_LV/banks.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/lv_LV/boxes.lang
htdocs/langs/lv_LV/opensurvey.lang
htdocs/langs/lv_LV/users.lang
htdocs/langs/ro_RO/admin.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/cron.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/help.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/margins.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2
Fix: Missing some languages into the transifex sync script.
...
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
0bf88ce44f
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2013-12-31 10:48:51 +01:00
Laurent Destailleur
e142bd252d
Fix: disable code making jmobile crazy.
2013-12-31 10:48:15 +01:00
simnandez
9f020bb0a9
Fix: Ordering
2013-12-30 18:24:33 +01:00
Laurent Destailleur
f0151ce112
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-30 12:44:46 +01:00
Laurent Destailleur
2e0fc364bd
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb
Fix: Removed analytics tags
2013-12-30 12:35:32 +01:00
Laurent Destailleur
cfb791c584
Fix: Better translation
2013-12-29 19:30:11 +01:00
Marcos García de La Fuente
9b90e93fe5
Forgot typehinting for function payment_supplier_prepare_head
2013-12-28 23:24:24 +01:00
Marcos García de La Fuente
c6ded35d4b
Fixed quality control checks for PR #1357
2013-12-28 23:13:32 +01:00
Laurent Destailleur
8248f63826
Fix: Missing translation
2013-12-27 20:31:57 +01:00
Laurent Destailleur
29ae579298
Fix: Bad link
2013-12-27 20:29:30 +01:00
Laurent Destailleur
8207b7c243
Missing translation
2013-12-27 20:27:17 +01:00
Laurent Destailleur
7d6779bd4a
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-27 18:09:31 +01:00
Laurent Destailleur
d07c767f25
Fix: Alignement of element into block login
2013-12-27 17:55:24 +01:00
Laurent Destailleur
538e6c5dc2
Fix: Alignement of element into block login
2013-12-27 17:51:36 +01:00
Laurent Destailleur
da2f35e1a2
Fix: Missing translation.
...
Fix: Title of tab not visible
2013-12-27 17:43:52 +01:00
BENKE Charles
94bf105b13
Update llx_projet_task.sql
...
new field "ref" present on update sql but not on the table
2013-12-27 17:14:56 +01:00
Laurent Destailleur
3bb4de3e86
Better translation
2013-12-27 15:56:00 +01:00
Laurent Destailleur
8f84d65a65
Merge pull request #1356 from defrance69/patch-22
...
Update llx_projet_task.sql
2013-12-26 16:20:23 -08:00
Laurent Destailleur
49f3242796
Merge pull request #1357 from marcosgdf/payment_menu
...
Payment menu
2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
simnandez
3a496d1fa1
Fix: setup not saving changes
2013-12-26 11:33:47 +01:00
simnandez
91b104aeb8
Fix: setup not saving changes
2013-12-26 11:32:13 +01:00
Laurent Destailleur
22412443fe
Fix: Overwrite bad value of limit payment date only if payment date is
...
defined.
2013-12-25 18:12:13 +01:00
Laurent Destailleur
76e4ba06a4
Fix: Calulcation of oustanding amount must not include abandonned
...
invoices.
2013-12-25 17:36:37 +01:00
BENKE Charles
e9ef9b6e8d
Update llx_projet_task.sql
...
new field "ref" present on update sql but not on the table
2013-12-25 15:02:21 +01:00
Marcos García de La Fuente
917ddf0dee
Payments and Supplier payment pages tabs can now be extended from modules.
2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191
Fix: Can import contacts not linked to any thirdparties.
2013-12-24 16:11:23 +01:00
simnandez
fca35cb8b0
Fix: Bad url destination into category remove
2013-12-24 13:40:54 +01:00
simnandez
8c9d145759
Fix: Bad url destination into category remove
2013-12-24 13:39:58 +01:00
simnandez
bf333d4f54
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:39:37 +01:00
simnandez
d6b2f96c19
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:38:38 +01:00
Laurent Destailleur
81f1098d41
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-23 12:06:07 +01:00
Laurent Destailleur
331341bf5a
Fix: Bad picto
2013-12-23 12:05:32 +01:00
Laurent Destailleur
aad7d32f7d
Merge pull request #1354 from csalvador/webservices-debug
...
Webservices debug
2013-12-23 02:20:15 -08:00
Florian Henry
e971e4dfff
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
2013-12-23 11:05:14 +01:00
simnandez
d8644ec04c
Fix: Unable to make a withdrawal with two or more invocies
2013-12-23 10:47:35 +01:00
simnandez
11353786a1
Fix: Unable to make a withdrawal with two or more invocies
2013-12-23 10:46:19 +01:00
Laurent Destailleur
d9c7dc8697
Fix: Add protection to not delete a root directory when deleting a
...
company.
2013-12-21 12:04:39 +01:00
Cédric Salvador
18b163c6db
allow the webservice to create a private individual
2013-12-20 17:03:24 +01:00
Laurent Destailleur
47b1a2c082
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-12-20 13:55:10 +01:00
Laurent Destailleur
2bc579324d
Fix: Opening agenda for a specific day
...
Fix: No picto of thirdparty of contact if link is broken
2013-12-20 13:51:59 +01:00
Laurent Destailleur
9e5e74cb58
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/fourn/commande/fiche.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
Laurent Destailleur
acc4850d20
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-12-19 20:57:24 +01:00
Laurent Destailleur
b35f44e3cb
New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
...
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
simnandez
aac21c7a3c
Trad: Improve es_ES trans
2013-12-19 18:33:54 +01:00
simnandez
4d3290e4bf
Trad: Improve es_ES trans
2013-12-19 18:33:03 +01:00
simnandez
bfaf6d8ac8
Trad: Add missing es_ES trans
...
Conflicts:
htdocs/langs/es_ES/companies.lang
2013-12-19 18:20:16 +01:00
simnandez
e4da8623f8
Trad: Add missing es_ES trans
2013-12-19 18:18:26 +01:00
Cédric Salvador
168412a2d6
Wrong parameters order in the function call
2013-12-19 16:06:59 +01:00
Cédric Salvador
0a0ef548ef
Solved some bugs in order creation and validation
2013-12-19 16:06:59 +01:00
Cédric Salvador
f98838616e
Do not forget the thumbs directory when returning the images paths
2013-12-19 16:06:59 +01:00
simnandez
03e2901070
Fix: Lost stats filters into year selection
2013-12-19 15:45:40 +01:00
simnandez
a1e0d84e37
Fix: Lost stats filters into year selection
2013-12-19 15:43:22 +01:00
simnandez
c35fc6b2d8
Trad: Fix missing translation
2013-12-19 12:48:19 +01:00
simnandez
8e247e8615
Trad: Fix missing translation
2013-12-19 12:47:39 +01:00
simnandez
42dbe88baa
Trad: Add missing trans
...
Conflicts:
htdocs/langs/es_ES/main.lang
2013-12-19 10:51:06 +01:00
simnandez
1d4cf1a255
Trad: Update es_ES translations
...
Conflicts:
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
htdocs/langs/es_ES/stocks.lang
2013-12-19 10:48:55 +01:00
simnandez
2e840a3d37
Trad: Add missing trans
2013-12-19 10:41:44 +01:00
simnandez
3b3b66e612
Trad: Update es_ES translations
2013-12-19 10:29:34 +01:00
Laurent Destailleur
7e08ee9437
Merge pull request #1351 from atm-geoffrey/3.5
...
add extrafields support in supplier orders
2013-12-18 08:56:07 -08:00
Laurent Destailleur
8036151778
Merge pull request #1352 from marcosgdf/bug-1196
...
Corrected Copyright info for PR #1350
2013-12-18 08:49:51 -08:00
Geoffrey
1942b4a476
add extrafields support in supplier orders. managed in configuration but not in view mode
2013-12-17 16:15:48 +01:00
Laurent Destailleur
11e0fb8f7a
Fix: Missing ref field into export.
2013-12-17 09:11:36 +01:00
Laurent Destailleur
1dca56c213
Fix: Calculation of number of linked files was not working on taxes.
2013-12-16 23:45:12 +01:00
Marcos García
9c6df4faf4
Corrected Copyright info for PR #1350
2013-12-16 22:56:59 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Laurent Destailleur
6bfc0d14b2
Merge pull request #1350 from marcosgdf/bug-1196
...
Fixed bug #1196 : Product barcode search does not expect 13th digit on EAN13 type
2013-12-16 05:26:10 -08:00
Laurent Destailleur
d01e83029e
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 14:21:17 +01:00
Laurent Destailleur
7127f5fc21
fix: doxygen
2013-12-16 14:16:01 +01:00
Laurent Destailleur
6328aec65d
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 14:12:11 +01:00
Laurent Destailleur
cfec85c2d6
Fix: Rewrite content of getMarginInfos.
...
This solve bug of rounding with total price when we need a unit price.
This solve lso bug of rounding on non decimal basis that we don't want.
Also this remove calling database when not usefull so make possible to
call this function into fetch (this remove the FIXME not into comment
so).
2013-12-16 13:24:00 +01:00
Geoffrey
dce354adc3
add extrafields support in supplier orders. managed in configuration but not in view mode
2013-12-16 11:13:39 +01:00
Alexis Algoud
ba70794c1d
Add multicompany->enabled test
2013-12-16 09:45:38 +01:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Marcos García
290b810bb8
Little refactor in product/liste.php
2013-12-15 18:49:55 +01:00
Marcos García
d65374bb02
Fixed bug #1196 : Product barcode search does not expect 13th digit on EAN13 type
...
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
2013-12-15 18:44:53 +01:00
Laurent Destailleur
3c87e1e20d
Fix: no required class for not mandatory fields
2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
c34e50114a
Start to work on a basic print sticker tool
2013-12-15 03:23:10 +01:00
Laurent Destailleur
77d670ada2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-15 02:02:51 +01:00
Laurent Destailleur
bba2892752
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/commande/liste.php
2013-12-15 02:02:24 +01:00
Laurent Destailleur
692b2985ef
Prepare 3.6
2013-12-15 00:05:04 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
0e25939373
Fix: price function not correctly used
2013-12-14 17:40:23 +01:00
Laurent Destailleur
db9ef992eb
Fix: Clean var
2013-12-14 17:25:57 +01:00
Laurent Destailleur
648bf73bac
Fix: [ bug #1179 ] Wrong warnings on commande/liste.php / delivery date
...
should be checked
Conflicts:
htdocs/commande/liste.php
2013-12-14 15:49:08 +01:00
Laurent Destailleur
ed40e6d9b0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/langs/en_US/bills.lang
2013-12-14 15:44:10 +01:00
Laurent Destailleur
dc1ccbfae8
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:35:13 +01:00
Laurent Destailleur
8cd538cce4
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 15:26:58 +01:00
Laurent Destailleur
7ecb313798
Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers
2013-12-14 15:26:22 +01:00
Laurent Destailleur
6cc20cb731
Fix: Filter on third parties were wrong for external users.
2013-12-14 15:21:15 +01:00
Laurent Destailleur
5a4b5dcc26
Fix: Missing condition
2013-12-14 14:21:27 +01:00
Laurent Destailleur
6033b7dbba
Merge pull request #1347 from fappels/develop
...
fix sql error on create commande
2013-12-13 18:53:57 -08:00
Laurent Destailleur
2519f09133
Merge pull request #1345 from marcosgdf/translation-dev
...
Corrected translation
2013-12-13 18:52:48 -08:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
ad0d79a831
Merge pull request #1346 from marcosgdf/translation
...
Corrected translation
2013-12-13 18:51:04 -08:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
7af5cc18bc
Sync from transifex
2013-12-14 03:09:51 +01:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Laurent Destailleur
873f4b902d
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:31:06 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
b83f664ced
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 01:29:24 +01:00
Laurent Destailleur
88aa0ad4da
Fix: Doxygen problems
2013-12-14 01:28:59 +01:00
Laurent Destailleur
9af2ac1afa
Sync from transifex
2013-12-14 01:05:33 +01:00
Laurent Destailleur
5cd6c05384
Fix: Uniformize amounts
2013-12-14 00:31:29 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +01:00
Laurent Destailleur
c51fa7048c
Fix: text must not be encoded when provided as data of a function.
2013-12-13 21:12:18 +01:00
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
Laurent Destailleur
14f85dc8f1
Revert "Sync from transifex"
...
This reverts commit 579e7f8e63
2013-12-13 17:50:28 +01:00
Laurent Destailleur
9a07f31a8c
Doxygen
...
Bad translation
2013-12-13 17:36:43 +01:00
Alexis Algoud
4844aed67e
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-12-11 15:15:30 +01:00
Alexis Algoud
895f5452b4
In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted.
...
Ex in agefodd module:
$obj_link=new Propal($db);
$obj_link->id=$agf->propalid;
$resultdel=$obj_link->delete($user);
To prevent misuse of the function, the reference is not considered given
2013-12-11 15:14:29 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
Francis Appels
6b6a519afd
fix sql error create commande
...
While testing on an azure website I encountered a sql error on create
commande.
azure uses cleardb with mysql version 5.5.21-log
2013-12-10 23:10:42 +01:00
Laurent Destailleur
18592989aa
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 22:59:56 +01:00
Laurent Destailleur
eabbff3cd3
Fix: We should not load stock details at each product fetch
2013-12-10 22:59:51 +01:00
Laurent Destailleur
be3dd26672
Mark file as bugged (seriously)
2013-12-10 22:59:45 +01:00
Laurent Destailleur
ccba895e70
Fix: sql where on an int must not contains '
2013-12-10 22:59:40 +01:00
Laurent Destailleur
3fb3b109f8
Fix: Missing db transaction
2013-12-10 22:59:33 +01:00
Laurent Destailleur
6aba72e061
Better detection of corrupted module files.
2013-12-10 22:59:28 +01:00
Laurent Destailleur
1986a8db91
New: Add path file of trigger into admin trigger list page
2013-12-10 22:59:22 +01:00
Laurent Destailleur
68caa9e84a
Sync from transifex
2013-12-10 22:59:13 +01:00
Laurent Destailleur
f4880f6a85
Fix: checkstyle
2013-12-10 22:59:01 +01:00
Marcos García de La Fuente
012dde80d3
Added missing translations for permissions of margins module
2013-12-10 22:58:55 +01:00
Laurent Destailleur
884a9ddb79
Fix: Test must never be done on a translated string
2013-12-10 22:58:50 +01:00
Laurent Destailleur
a0fab45551
Comment
2013-12-10 22:58:45 +01:00
Laurent Destailleur
25e93dc605
Update ignore file
2013-12-10 22:58:39 +01:00
Laurent Destailleur
6890c26dd9
Remove <<<<
2013-12-10 22:58:34 +01:00
Laurent Destailleur
97843cbddb
Fix: Error management with corrupted module files
2013-12-10 22:58:28 +01:00
damien clochard
56162496a6
bug #1179
...
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...
For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
2013-12-10 22:58:23 +01:00
Laurent Destailleur
75703a03cc
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-10 21:48:22 +01:00
Laurent Destailleur
f0eb98c27a
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93
Fix: We should not load stock details at each product fetch
2013-12-10 19:41:45 +01:00
Laurent Destailleur
da569ea8d4
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:39:28 +01:00
Laurent Destailleur
ad420bbf42
Mark file as bugged (seriously)
2013-12-10 18:56:02 +01:00
Laurent Destailleur
aa4ae60826
Fix: sql where on an int must not contains '
2013-12-10 18:54:44 +01:00
Laurent Destailleur
ce3047203f
Fix: Missing db transaction
2013-12-10 18:54:07 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Laurent Destailleur
df779086a6
Fix: We should not load stock details at each product fetch
2013-12-10 18:04:25 +01:00
Laurent Destailleur
b1e6ac5631
Mark file as bugged (seriously)
2013-12-10 17:53:12 +01:00
Laurent Destailleur
c78fc504af
Fix: sql where on an int must not contains '
2013-12-10 17:21:48 +01:00
Laurent Destailleur
7b73201f2e
Fix: Missing db transaction
2013-12-10 17:18:28 +01:00
Laurent Destailleur
c3c6588426
Better detection of corrupted module files.
2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Marcos García de La Fuente
02700edf22
Corrected translation
2013-12-10 14:38:34 +01:00
Marcos García de La Fuente
d226abcdfc
Corrected translation
2013-12-10 14:30:40 +01:00
Raphaël Doursenaud
0d36435018
Added missing language loads for bookmarks
2013-12-10 12:04:07 +01:00
Raphaël Doursenaud
add5a232ac
Added some security assessments to bookmarks
2013-12-10 12:01:08 +01:00
Raphaël Doursenaud
5e642f3009
Bookmarks multicompany migration
2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
071dd8e758
Make bookmarks module multicompany aware
2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
d3d1863150
Removed unused file
2013-12-10 11:39:41 +01:00
Raphaël Doursenaud
5ba9a1134b
Removed dead code
2013-12-10 11:38:02 +01:00
Laurent Destailleur
a89a4ee81a
Fix: Delete vat entry when bank line was already deleted.
2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48
Fix: fields too large
2013-12-09 11:00:36 +01:00
Laurent Destailleur
579e7f8e63
Sync from transifex
2013-12-09 09:26:48 +01:00
Laurent Destailleur
d34d1aed2e
Fix: checkstyle
2013-12-09 02:21:21 +01:00
Laurent Destailleur
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +01:00
Laurent Destailleur
95a41ca2fd
Merge pull request #1343 from marcosgdf/missing-translations
...
Added missing translations for permissions of margins module
2013-12-08 17:01:38 -08:00
Laurent Destailleur
705192215a
Merge pull request #1341 from marcosgdf/bug-1182
...
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 16:49:50 -08:00
Laurent Destailleur
f36354234d
Merge pull request #1339 from daamien/patch-1
...
bug #1179
2013-12-08 16:48:52 -08:00
Laurent Destailleur
565fb615bc
Update gitignore
2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24
Fix: Missing translation
2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
02036af782
Added missing translations for permissions of margins module
2013-12-08 21:18:01 +02:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01:00
Laurent Destailleur
b0e18348d9
Fix: Test must never be done on a translated string
2013-12-08 16:39:47 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
9b779e8ed8
Update ignore file
2013-12-08 15:09:35 +01:00
Laurent Destailleur
4d44f93c98
Remove <<<<
2013-12-08 12:01:59 +01:00
Laurent Destailleur
7aa2c9dcd1
Fix: Error management with corrupted module files
2013-12-08 02:33:32 +01:00
Laurent Destailleur
a90f6ef368
Fix: Error management with corrupted module files
2013-12-08 02:32:04 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
d8cd7571ec
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b
Update ignore files
2013-12-07 18:47:58 +01:00
Laurent Destailleur
0e819ab5cd
Fix: Missing test
2013-12-07 16:43:35 +01:00
Laurent Destailleur
73e60e0629
Fix: Mass update of vat must work also for supplier prices
...
Conflicts:
htdocs/product/admin/product_tools.php
2013-12-07 12:06:41 +01:00
Laurent Destailleur
adf55408a4
Fix: Bad parameter that duplicate info.
2013-12-07 03:23:14 +01:00
Laurent Destailleur
fa0470bdb9
Fix: Mass update of vat must work also for supplier prices
2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26
Fix: Vat rate was not set during update
2013-12-07 01:22:27 +01:00
Laurent Destailleur
62e209520a
Fix: Update when submitting form
2013-12-07 00:53:58 +01:00
Laurent Destailleur
76d111b09f
Fix: W3C form must be outside table tag
2013-12-07 00:26:30 +01:00
Laurent Destailleur
87db1d880b
Fix: css
2013-12-06 21:03:59 +01:00
damien clochard
c36ba2a8ea
bug #1179
...
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...
For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
2013-12-06 13:08:30 +01:00
Laurent Destailleur
598a241366
Fix: minor css.
...
Fix: Alignement of screenshot was wrong. Wrapping too.
2013-12-06 10:23:26 +01:00
