simnandez
f5947abc71
Trad: Add ca_ES and es_ES boxes translations
2013-08-26 11:49:22 +02:00
Laurent Destailleur
67892575be
Merge pull request #1167 from PaulPoulain/999-develop
...
T999-develop: link invoice to a command
2013-08-25 03:23:57 -07:00
Laurent Destailleur
903b75c1cd
Merge pull request #1165 from PaulPoulain/975-develop
...
T975-develop: Don't print the mail of the contact who is gone
2013-08-25 03:23:26 -07:00
Laurent Destailleur
4eb37abed9
New: Translate the email to change password.
2013-08-25 06:53:59 +02:00
Laurent Destailleur
4ec85e6722
Update romanian language files
...
Added vietnamese language files
2013-08-25 01:38:31 +02:00
Laurent Destailleur
94d3e6d3cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
2013-08-24 22:45:57 +02:00
Laurent Destailleur
70f7321d51
Comment
2013-08-24 22:45:02 +02:00
Laurent Destailleur
07cba2d232
Merge pull request #1194 from grandoc/develop
...
fix : warning during install
2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
6d2c27beec
Fix: header already sent
2013-08-24 22:09:32 +02:00
Laurent Destailleur
cafd75ac4a
Revert a bad fix.
2013-08-24 21:55:02 +02:00
Laurent Destailleur
1c08cad6b9
Fix: Bad translation (to pick to 3.4)
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-08-24 20:59:02 +02:00
Laurent Destailleur
75bd05d212
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-24 19:36:17 +02:00
Grand Philippe
e9dc71a9af
first step to complete contract functionalities
2013-08-24 16:18:30 +02:00
Grand Philippe
fcd748eedb
first step to complete contract functionalities
2013-08-24 16:16:42 +02:00
Grand Philippe
a0c04a548b
first step to complete contract functionalities
2013-08-24 15:59:49 +02:00
Grand Philippe
e56e0ebfb5
add extrafields
2013-08-24 13:49:55 +02:00
Grand Philippe
71a9e148b3
fix : warning during install
2013-08-24 11:34:34 +02:00
simnandez
fd759ade76
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:04:10 +02:00
simnandez
c242d66530
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:03:16 +02:00
Juanjo Menent
68cd8550d5
Merge pull request #1193 from defrance69/patch-11
...
Update export.class.php
2013-08-23 02:02:28 -07:00
Christophe Battarel
24b28d65e4
fix margin reports bugs (wrong group by + jquery syntax error)
...
Conflicts:
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
2013-08-23 10:57:29 +02:00
BENKE Charles
0c249c2127
Update export.class.php
...
bug fix
2013-08-23 10:46:53 +02:00
Juanjo Menent
376b2812fe
Merge pull request #1190 from altairis-fr/develop
...
add ability to modify margin rate on line edit if authorized
2013-08-23 00:18:08 -07:00
Christophe Battarel
26b8f29682
fix display of buying price on line edit when no supplier price is defined
2013-08-23 09:16:37 +02:00
Christophe Battarel
edf7af444c
fix margin reports bugs (wrong group by + jquery syntax error)
2013-08-23 09:10:15 +02:00
Christophe Battarel
ecdce9ddf6
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
2013-08-23 09:07:10 +02:00
Florian Henry
aeb072b1eb
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-23 09:02:50 +02:00
Juanjo Menent
37e3455f82
Merge pull request #1191 from FHenry/3.4
...
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 23:59:16 -07:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Florian Henry
4f991da846
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 15:11:11 +02:00
Laurent Destailleur
c1dae58055
Fix: Bad translation (to pick to 3.4)
2013-08-22 12:46:10 +02:00
Christophe Battarel
4df216afbc
add ability to define margin when adding line with new experimental form
2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff
allow to modify margin rate or mark rate but not both
2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb
add ability to modify margin rate on line edit if authorized
2013-08-22 11:39:55 +02:00
lalaina rasamoelina
8a4041e534
T975-develop Add an element (statut) in the table llx_socpeople
...
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b
Put the status of contact in the list of contact
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373
Style of page
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
148abfbe72
Printing the contact in the list
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178
Delete the contact who are gone,in the email list
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
83d5c1a441
Printing of contact
2013-08-22 11:04:05 +02:00
Christophe Battarel
32dd1e4480
fix display of buying price on line edit when no supplier price is defined
2013-08-22 10:45:42 +02:00
lalaina rasamoelina
f913422e62
T999-develop: link invoice to a command
...
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
2013-08-22 10:17:03 +02:00
Laurent Destailleur
05040d1997
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-21 22:21:33 +02:00
Laurent Destailleur
ea4ac30b28
Fix: more responsive box
2013-08-21 21:39:39 +02:00
Christophe Battarel
dd32dbacb5
Fix retrieving of margin info when invoice created automatically from order (used by workflow module)
2013-08-21 18:55:11 +02:00
simnandez
dfe2b7ec4d
Fix UserGroup name not display in card view or edit
2013-08-21 18:47:51 +02:00
