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
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
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
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
a2531872cb
Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales
2014-04-06 21:17:35 +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
3a2caa6e64
New: Can filter on status for supplier order.
2014-04-02 12:48:34 +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
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
BENKE Charles
f1d9cebb93
Update propal.class.php
...
refactoring LibStatut function (small is better)
2014-03-31 02:38:07 +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
f282ffc549
Merge pull request #1508 from KreizIT/3.5
...
FIX :[bug #1309 ]
2014-03-27 15:58:13 +01:00
Florian Henry
3d12979b3f
remove debug string
2014-03-26 09:53:48 +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
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
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
jfefe
f648f85b61
Remove debug infos into agenda index
2014-03-15 15:44:02 +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
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
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
Marcos García de La Fuente
8bc273298e
Corrected proposals extrafield admin page translation
2014-03-11 12:38:11 +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
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +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
0283c16a47
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-06 18:27:09 +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
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +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
Laurent Destailleur
7db903e671
Fix: special code was lost during update
2014-03-01 16:58:10 +01:00
Laurent Destailleur
45898a989c
Fix: Translation done twice
2014-03-01 10:16:03 +01:00
simnandez
afebf86bf1
Fix: Loading actions extrafields fails.
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-26 16:55:42 +01:00
simnandez
8ffa11fe16
Fix: Loading actions extrafields fails.
2014-02-26 16:50:38 +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
e8cadf3a3e
New: Add form search customer order on commercial main page.
2014-02-25 18:33:04 +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
Florian Henry
ec8ad9f8bb
codesniffer
2014-02-23 20:10:05 +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
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +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
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
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
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
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
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
4869b95601
Fix: Default size too long making screen hang.
2014-02-12 00:01:22 +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
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
b750e98d40
Fix: Pb of file upload and download.
2014-02-08 02:02:01 +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
d1951393c7
Fix: priority is a field smallint.
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-06 17:09:41 +01:00
Laurent Destailleur
9166dc2d8c
Fix: priority is a field smallint.
2014-02-06 16:57:45 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +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
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
d6c4fa5fe3
Qual: Normalize code
2014-01-30 00:40:00 +01:00
Laurent Destailleur
5657bd7793
New: Can create contract from an order.
2014-01-28 15:26:20 +01:00
Laurent Destailleur
f83b47be9f
Fix: Missing loading lang files.
2014-01-26 18:43:30 +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
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
9341db3e86
Fix: Missing id
2014-01-22 03:20:18 +01:00
Christophe Battarel
81bae5fff9
fix wrong constant usage
2014-01-21 18:33:25 +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
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
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +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
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
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
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
374be1854e
Fix: Bad url
2014-01-09 23:12:28 +01: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
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
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
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
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
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
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +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
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
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
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
6cc20cb731
Fix: Filter on third parties were wrong for external users.
2013-12-14 15:21:15 +01:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -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
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
88aa0ad4da
Fix: Doxygen problems
2013-12-14 01:28:59 +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
Laurent Destailleur
ce3047203f
Fix: Missing db transaction
2013-12-10 18:54:07 +01:00
Laurent Destailleur
7b73201f2e
Fix: Missing db transaction
2013-12-10 17:18:28 +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
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
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