lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,045 Commits 43 Branches 150 Tags 886 MiB
4958d17d24
Commit Graph

4645 Commits

Author SHA1 Message Date
Raphaël Doursenaud
8010389c08 Fixed wrong path in CSS 2013-09-05 20:29:06 +02:00
Raphaël Doursenaud
d39f2d655c Typo fix: remove unwanted comma 2013-09-05 20:28:24 +02:00
Raphaël Doursenaud
0e8eddb470 Revert "Method should be static" 
This reverts commit 4ca5bc3797.
 2013-09-05 19:00:00 +02:00
Raphaël Doursenaud
6e64e0e7be Fixed gd calls for windows bitmap images 2013-09-05 17:56:28 +02:00
Juanjo Menent
15bb60c8a1 Merge pull request #1212 from FHenry/develop 
Add ref supplier into muscadet model
 2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
cd684460ff Removed silly code 2013-09-05 17:30:17 +02:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
465d59ba82 Don't call non static class statically 2013-09-05 16:44:57 +02:00
Raphaël Doursenaud
4ca5bc3797 Method should be static 2013-09-05 16:44:02 +02:00
Raphaël Doursenaud
0c0740cac7 Don't call non static class statically 2013-09-05 16:43:22 +02:00
Raphaël Doursenaud
109cc09e82 Simplified JS 2013-09-05 16:37:23 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
Florian Henry
d8ddb8b3e7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f Add ref supplier into muscadet model 2013-09-03 20:07:08 +02:00
Laurent Destailleur
23df3d82e5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 18:10:55 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
Juanjo Menent
7293d58002 Merge pull request #1208 from grandoc/develop 
Add an additional description for the category products
 2013-09-03 02:43:30 -07:00
Grand Philippe
6d6f30725b Add an additional description for the category products 2013-09-03 11:41:33 +02:00
Laurent Destailleur
e40452f3b2 Fix: Bug if modules not enabled 2013-09-03 11:36:28 +02:00
Grand Philippe
dfdc9da781 Add an additional description for the category products 2013-09-03 11:15:19 +02:00
BENKE Charles
bb8f8332f9 Update modProjet.class.php 
enhance export feature with
left join and projet_task_time data
 2013-09-03 11:12:29 +02:00
Grand Philippe
da384dda18 uniformize 2013-09-02 11:53:07 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
Laurent Destailleur
3a4896609a Fix: Remove debug print 2013-09-02 00:38:13 +02:00
Laurent Destailleur
e6611b6ba1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-02 00:34:55 +02:00
Laurent Destailleur
51cc957b97 Fix: select list on external table 2013-09-02 00:34:41 +02:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop 
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
 2013-09-01 15:01:33 -07:00
Laurent Destailleur
1392f4e623 Merge pull request #1203 from PaulPoulain/966-develop 
T966-develop : Put the poste of the contact in the list
 2013-09-01 14:49:06 -07:00
Laurent Destailleur
8cd1563f58 More test 2013-09-01 20:55:59 +02:00
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
Christophe Battarel
06b8e939bd manage user permissions for margin rate 2013-08-20 12:04:01 +02:00
Christophe Battarel
220f9b7e9f define global user variables so templates can manage user permissions 2013-08-20 12:01:52 +02:00
Christophe Battarel
8128ed0556 define user permissions on margin module 
update changelog
 2013-08-20 12:00:16 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty 
value.
 2013-08-20 11:51:24 +02:00
Laurent Destailleur
b18d5166de Fix: Size of picture into PDF 2013-08-19 13:30:30 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Juanjo Menent
8ba3410766 Merge pull request #1179 from altatof/saisie_marges 
ability to define margin rate on quotes, orders, invoices
 2013-08-14 01:00:29 -07:00
simnandez
3577025f0e Fix update extrafield do not display immediatly 2013-08-14 09:56:08 +02:00
Florian Henry
60b3f61339 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-08-13 12:13:47 +02:00
simnandez
5cbfa61731 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
3502747247 Merge pull request #1175 from FHenry/develop 
Add pdf link into supplier invoice list and supplier order list
 2013-08-09 12:18:40 -07:00
Laurent Destailleur
ff4ebe423b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-09 19:21:32 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
Laurent Destailleur
ecf8e06487 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-08 20:07:24 +02:00
Laurent Destailleur
bfd2d7ada2 Fix: Sort order works with special chars. 2013-08-08 20:06:56 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
2a0597a6d4 Merge pull request #1161 from PaulPoulain/948-develop 
T948-develop :Classify Billed when the price of bill is greater than command
 2013-08-07 16:48:32 -07:00
Laurent Destailleur
b1f528f4d5 Comment code of a deprecated variable. 2013-08-07 20:56:10 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33 Fix: Bad dir 2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4 Fix: Bad var name 2013-08-07 13:33:22 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
3caf119596 Fix: Param must be a regex string 2013-08-06 19:23:43 +02:00
lalaina rasamoelina
0fa4739d47 T948-develop :Classify Billed when the price of bill is greater than command 
-In the workflow i've added on bouton which permitted
		to classify billed when the price of bills is greater
 		than command,if her status is delivered

		/htdocs/admin/workflow.php
 2013-08-06 16:57:40 +02:00
Juanjo Menent
aab90bfe76 Merge pull request #1154 from atm-maxime/develop 
Fix : supplier invoice mask + numbering
 2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e Numbering should be on invoice date, not creation date 2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905 Fix : supplier invoice mask + numbering 2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6 Fix: lang file 2013-08-06 03:56:59 +02:00
Laurent Destailleur
b7cada9a99 Fix: End of menu when no module selected. 2013-08-06 03:01:56 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
8d90289bfc Merge pull request #1153 from csalvador/print_address_hook 
added hook to the print address function
 2013-08-05 11:51:08 -07:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
928446596d Perf: Optimize memory usage when generating graph. 2013-08-05 18:30:10 +02:00
Cédric Salvador
0127ed8b33 added hook to the print address function 2013-08-05 18:07:10 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
 2013-08-03 16:24:52 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
Laurent Destailleur
c18fed7e4c New: A box can use a "or" on module conditions 2013-08-02 14:54:22 +02:00
Juanjo Menent
ba8d094ec5 Merge pull request #1152 from atm-maxime/develop 
Better fix for email text / signature integration
 2013-08-02 03:13:42 -07:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
a0738e86d8 Better fix for email text / signature integration 2013-08-02 10:24:09 +02:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop 
Task # 1016 : deposits numbering
 2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44:21 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Laurent Destailleur
2fa1032079 Merge pull request #1145 from atm-maxime/develop 
Fix : email message combined with html signature made troubles with line breaks
 2013-08-01 02:09:52 -07:00
Laurent Destailleur
ba2c6d4d54 Fix: Confirm boxes with jmobile 2013-08-01 05:13:13 +02:00
Laurent Destailleur
53672dff75 Fix: Confirm boxes with jmobile 2013-08-01 04:20:08 +02:00