Florian Henry
bc4cfd66db
Fix: fix unsubscribe URL into mailing when sending manually (not by
...
script)
2013-12-02 15:07:34 +01:00
Florian Henry
c0ef63fd74
Bteer fix
2013-12-02 00:22:49 +01:00
Laurent Destailleur
b6386a3dce
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/tpl/objectline_add.tpl.php
2013-12-01 16:08:03 +01:00
Laurent Destailleur
d39ed05c5d
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/propal/list.php
2013-12-01 16:05:09 +01:00
Laurent Destailleur
5715e9c986
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 17:06:11 +01:00
Florian Henry
b9d37fd6f7
[ bug #1159 ] Commercial search "other" give p.note do not exists
2013-11-28 14:28:03 +01:00
Laurent Destailleur
88ae0a7945
Fix: the rename function is bugged with some windows. I add a
...
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
2013-11-28 12:58:02 +01:00
aspangaro
e1b4d01235
Improvement of the Skype button
...
Perm & add a button"Chat"
2013-11-24 21:28:15 +01:00
Laurent Destailleur
e45406694b
Fix: no filter is value is ''
2013-11-23 19:28:41 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Raphaël Doursenaud
7945011955
Make AJAX new line form work again
...
FIXME: Factorize!
2013-11-19 17:54:36 +01:00
Laurent Destailleur
a71e4c598a
Fix: Must navigate between all thirdparties elligible for tab.
2013-11-18 15:41:42 +01:00
Laurent Destailleur
48570f599a
Fix: form is not allowed into a table. This break some javascript and
...
make some browsers crazy.
2013-11-17 23:25:25 +01:00
Laurent Destailleur
8ec50fce23
Move warning at correct place.
...
Fix: Reset of amount was not working
2013-11-16 14:26:42 +01:00
Laurent Destailleur
b7190d2609
Fix: Several bugs.
2013-11-16 13:00:21 +01:00
Laurent Destailleur
5b243abe4b
Fix: Miscellaneous fixes
2013-11-16 12:00:08 +01:00
simnandez
c8f1a26d25
Format with price function
2013-11-15 17:55:48 +01:00
Florian Henry
a73275b9c1
Add prospect code client into prospect list
2013-11-13 13:17:32 +01:00
Florian Henry
6bf2220a67
Add status filter into prospect and customer list
2013-11-12 15:22:11 +01:00
Raphaël Doursenaud
594781ec62
Codestyle
2013-11-08 15:31:22 +01:00
Raphaël Doursenaud
9be462e43c
Text is not a type, let's use string
2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
e514b50d7e
Typo fix
2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
d5ab0723ba
Timestamp is not a type
...
Timestamps are integers so let's document this correctly
2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
74f83b235a
Typecasting
...
The GETPOST method returns string, let's make the typecast explicit.
2013-11-07 21:05:39 +01:00
Raphaël Doursenaud
9e0f8c5f57
Method is void, let's not print void
2013-11-07 21:02:21 +01:00
Raphaël Doursenaud
8907c9944d
Assigments in conditions is often considered bad practice
...
So let's put a comment, just in case
2013-11-07 20:51:30 +01:00
Raphaël Doursenaud
638764f86d
Moved unreachable statement to conditions
2013-11-07 20:38:06 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
c4a43890c4
Merge pull request #1282 from grandoc/develop
...
fix : language
2013-11-05 10:50:14 -08:00
Laurent Destailleur
2d7181553b
Fix: translation
2013-11-05 15:29:58 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Laurent Destailleur
b18e125143
Merge pull request #1279 from aspangaro/skype
...
Task 157 : add a Skype button
2013-11-05 05:33:33 -08:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
Laurent Destailleur
0587ad5af8
Fix: duplicate button
2013-11-05 10:44:58 +01:00
Laurent Destailleur
2f47b0fcfd
Fix: picto for status8 is a flash red icon to report a critical error
...
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
2013-11-04 23:56:15 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Laurent Destailleur
ecfa795306
Merge pull request #1270 from grandoc/develop
...
missing GETPOST
2013-10-31 04:37:46 -07:00
braito4
e89c3fa074
Update list.php
...
sql error.
2013-10-30 11:51:23 +01:00
Grand Philippe
0ae489aee7
missing GETPOST
2013-10-30 09:34:59 +01:00
Florian Henry
bdcbd4ee42
Fix list propal and invoice to display customer ref if option is set
2013-10-22 12:47:26 +02:00
Laurent Destailleur
315e2e4c13
Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
...
defrance69-patch-14
Conflicts:
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +02:00
Laurent Destailleur
cb889c525c
Fix: filter on type of event was lost
2013-10-15 16:42:19 +02:00
Laurent Destailleur
fa1e56b976
Code comment
2013-10-15 15:17:33 +02:00
Laurent Destailleur
ef86f150be
Fix: duplicate field
2013-10-08 12:25:41 +02:00
Laurent Destailleur
c235c4e4ba
Fix: security sql injection
2013-10-07 22:50:27 +02:00
Laurent Destailleur
3f94af792b
Fix: security sql injection
2013-10-07 22:49:33 +02:00
