Laurent Destailleur
4272209832
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-31 12:44:13 +02:00
Laurent Destailleur
a8096c7359
New: Export/import profile include state.
2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5
[ task #1044 ] Add option to enabled thirdparty number into select
...
thirdparty list
2013-08-30 18:18:58 +02:00
Florian Henry
8b9b682eaf
Merge remote-tracking branch 'origin/develop' into develop
2013-08-30 18:11:47 +02:00
simnandez
2a8aa50163
Fix: Intervention box links to contracts id
...
Conflicts:
htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6
Fix: Intervention box links to contracts id
2013-08-29 12:05:29 +02:00
simnandez
a321264a2a
Fix: Localtaxes balance not showing
...
Conflicts:
ChangeLog
2013-08-29 10:03:32 +02:00
simnandez
fa4a9c73c4
Fix: Localtaxes balance not showing
2013-08-29 09:58:07 +02:00
lalaina rasamoelina
3156f8cae0
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-29 09:30:26 +02:00
Florian Henry
29396bd51a
Change SQL syntax
2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb
adjust spacing
2013-08-28 16:50:38 +02:00
Florian Henry
650689d294
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-08-28 16:49:22 +02:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
lalaina rasamoelina
ca6a973d96
T940-develop: creating a bouton which permit to create an event in the propal,and command .
...
If we create an event in the propal, then the events will be attached in the propal
and if it's for command,it will be attached in the command
2013-08-27 15:51:06 +02:00
Regis Houssin
841961df4e
Fix: wrong function name
2013-08-27 14:53:24 +02:00
Laurent Destailleur
657c4d6e90
Fix: Fix graph for product distribution.
...
Add limit and add entry other.
2013-08-27 11:54:07 +02:00
simnandez
34fe1fba7f
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Grand Philippe
24e6042378
some fix for contract model
2013-08-26 15:32:56 +02:00
Grand Philippe
7a64ad1a26
some fix for contract model and clean code
2013-08-26 14:29:46 +02: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
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
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
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
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
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +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
5ed186e178
Delete the contact who are gone,in the email list
2013-08-22 11:04:06 +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
Laurent Destailleur
327aa80ed0
Fix: Error management
...
New: Autoselect category in list if there is only one element in list.
2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb
Qual: Clean code by moving synchro with mailman into mailman trigger
...
New: A trigger can return an array of error strings instead of one error
string.
2013-08-21 12:39:20 +02:00
simnandez
913888824f
Remove duplicate $user
2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0
manage user permissions for margin display
2013-08-20 12:11:19 +02:00
