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

33600 Commits

Author SHA1 Message Date
Laurent Destailleur
c147fc6016 Fix: checkstyle 
Try phpcs into travis
 2013-09-10 02:09:55 +02:00
Laurent Destailleur
ad851a6432 Added language fr_NC 2013-09-10 01:44:21 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
Laurent Destailleur
2b8af33505 Fix: eof 2013-09-09 19:15:34 +02:00
jfefe
13e235ca8a Fix: permission check in invoice webservice 
remove comment & indent code
 2013-09-09 17:08:22 +02:00
Laurent Destailleur
d22985c5fa More accurate log file 2013-09-09 12:23:15 +02:00
Cédric Salvador
0c93c6f0b1 format 2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f indentation 2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34 don't display warehouse selection if there's only one 
Conflicts:
	htdocs/compta/facture.php
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang
 2013-09-09 09:55:51 +02:00
Laurent Destailleur
e2b8ad2035 Fix: not defined value 2013-09-09 03:43:59 +02:00
Laurent Destailleur
414ab39d30 Fix: bug detected with phpunit 2013-09-09 02:37:11 +02:00
Laurent Destailleur
89619cad7b Fix: Unit test regression 2013-09-08 23:38:40 +02:00
Laurent Destailleur
afe58abdcd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +02:00
Laurent Destailleur
2685c47185 Download transifex changes 2013-09-08 00:52:48 +02:00
Laurent Destailleur
edaeaf3803 Fix: field is not mandatory 2013-09-08 00:23:32 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30 Fix: navigation of supplier invoices 2013-09-07 19:50:47 +02:00
Laurent Destailleur
082cf0b487 Revert "Avoid silly assignment" 
This reverts commit fa51e310b8.
 2013-09-07 19:27:35 +02:00
Laurent Destailleur
1c62d2a475 Fix: Ref not visible into page 2013-09-07 19:11:54 +02:00
Laurent Destailleur
3a8784a6de Qual: Mutualize code 2013-09-07 19:08:08 +02:00
Laurent Destailleur
b7d2811048 Merge pull request #1216 from FHenry/develop 
Fix bug on category contact
 2013-09-06 13:49:39 -07:00
Laurent Destailleur
2d354de549 Merge pull request #1211 from FHenry/3.4 
Fix: Delete linked element to supplier invoice when deleted (as done for
 2013-09-06 13:49:27 -07:00
Laurent Destailleur
8a82b01b22 Merge pull request #1217 from csalvador/replenishment-fix 
Replenishment fix
 2013-09-06 13:48:47 -07:00
Laurent Destailleur
dfce949b06 Merge pull request #1219 from csalvador/hide_purchase_price 
Hide purchase price
 2013-09-06 13:48:04 -07:00
Laurent Destailleur
884965a679 Merge pull request #1218 from GPCsolutions/develop-review 
Fixed bad copy-paste
 2013-09-06 13:47:14 -07:00
Laurent Destailleur
651596e8d5 Fix: missing ; 2013-09-06 13:42:14 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
87a4418baf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-06 10:50:44 +02:00
Cédric Salvador
4454bc16de indentation 2013-09-06 10:49:18 +02:00
Laurent Destailleur
9fa6d4ccdf Fix: Avoid error for free products. Also add hidden otion to enable 
this. In most cases, we don't want to do this.
 2013-09-06 10:40:44 +02:00
Cédric Salvador
d592e776fd hide purchase price unless the user has the appropriate rights 
Conflicts:
	htdocs/product/liste.php
 2013-09-06 10:40:33 +02:00
Raphaël Doursenaud
ae36934746 Fixed bad copy-paste 2013-09-06 10:22:13 +02:00
Cédric Salvador
413d76ce51 fixed error level 2013-09-06 09:56:07 +02:00
Raphaël Doursenaud
1db9cdac28 Fixed pagination 2013-09-06 09:56:07 +02:00
Cédric Salvador
d8e5fbc662 keep the alert filter when changing page 2013-09-06 09:56:06 +02:00
Cédric Salvador
a9ca9c04ef Fixed request returning nothing when there's no records in llx_product_stock 2013-09-06 09:56:06 +02:00
Cédric Salvador
0a6079934b alertonly checkbox stays checked 2013-09-06 09:56:06 +02:00
Cédric Salvador
41ad9bdb7f frenglish is bad 2013-09-06 09:56:06 +02:00
Cédric Salvador
6015a36183 filter on stock alert 2013-09-06 09:56:06 +02:00
Cédric Salvador
bbae47c48f natural search 2013-09-06 09:56:06 +02:00
Cédric Salvador
b58297a791 fixed warning showing up when searching 2013-09-06 09:56:05 +02:00
Cédric Salvador
6a51f5f87a don't jump to the product card when there's only one research result 2013-09-06 09:56:05 +02:00
Laurent Destailleur
d7a14a15b3 Fix: Bad link 2013-09-06 09:26:23 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Laurent Destailleur
38e4b0f9ac Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/watch
 2013-09-05 23:57:30 +02:00
Laurent Destailleur
d493dc8513 Merge pull request #1215 from GPCsolutions/develop-review 
Develop review
 2013-09-05 13:51:28 -07:00
Florian Henry
e7520b4bc7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-05 21:03:10 +02:00
Florian Henry
34d4c15d0e Fix bug on category contact 2013-09-05 21:03:03 +02:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
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
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Raphaël Doursenaud
6e64e0e7be Fixed gd calls for windows bitmap images 2013-09-05 17:56:28 +02:00
Florian Henry
2740cc78b6 Add dol_syslog 
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
 2013-09-05 17:45:30 +02:00
Florian Henry
95ff16f145 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-05 17:39:49 +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
7681c60f6b Silly assignment was a bug 2013-09-05 17:22:51 +02:00
Raphaël Doursenaud
fa51e310b8 Avoid silly assignment 2013-09-05 17:19:30 +02:00
Raphaël Doursenaud
9046d620e1 Avoid using the same var as outer loop 2013-09-05 17:15:06 +02:00
Raphaël Doursenaud
8e6860ac72 Fixed developer intent 2013-09-05 17:01:15 +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
5d27ce0173 Merge pull request #1213 from open-minds/develop 
Fix owner address of company bank account
 2013-09-04 01:48:00 -07:00
Laurent Destailleur
b1c25d91cd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
Laurent Léonard
ec86efaab2 Fix owner address of company bank account 2013-09-03 23:57:36 +02:00
Florian Henry
ddeca06f32 Real ref filter 2013-09-03 21:13:05 +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
Florian Henry
cb86cd403c Fix: Delete linked element to supplier invoice when deleted (as done for 
all other object into dolibarr)
 2013-09-03 20:01:10 +02:00
Laurent Destailleur
64b44298ae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 18:19:15 +02:00
Laurent Destailleur
c5020056b3 Revert commit. 
Bug into update function. Also what was difference of new field ?
 2013-09-03 18:18:22 +02:00
simnandez
6ae3603549 Trad: Add missing translations 2013-09-03 18:16:30 +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
Grand Philippe
222eb18bb9 fix : 
Fatal error: Call to undefined function dol_time_plus_duree()
 2013-09-03 17:37:22 +02:00
Juanjo Menent
bcbe4e582c Merge pull request #1209 from grandoc/develop 
Add an additional description for the category products
 2013-09-03 06:25:39 -07:00
Grand Philippe
9f01aa51a3 fix regression 2013-09-03 15:19:03 +02:00
Grand Philippe
397d0e3b81 Add an additional description for the category products 2013-09-03 15:12:15 +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
simnandez
614f376392 Trad: Fix bad descriptor 2013-09-03 09:25:14 +02:00
Laurent Destailleur
b02bf5a2a7 Syn with transifex 2013-09-03 00:42:54 +02:00
Grand Philippe
da384dda18 uniformize 2013-09-02 11:53:07 +02:00
Grand Philippe
4c5d9e8441 fix : activate a model 2013-09-02 10:17:45 +02:00
simnandez
58e2c4e38e Fix: compatiblity with multicompany module 2013-09-02 10:08:38 +02:00
simnandez
83042459a5 Fix: compatiblity with multicompany module 2013-09-02 10:07:44 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
b150e03b06 Fix: bad merge. 
Fix: Restore backward compatibility. Add option hideifdisabled for call
that does not need disabled users.
 2013-09-02 00:47:30 +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
20b92ca4d7 Merge pull request #1160 from defrance69/patch-10 
Update index.php
 2013-09-01 15:20:57 -07: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
0ca6c3f6ad Fix: Missing class 2013-08-31 16:58:25 +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
Florian Henry
853758a422 REplicate extrafield value 
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
 2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e All deposit inoice form order 2013-08-30 10:46:05 +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
lalaina rasamoelina
fcd6985196 T966-develop : Put the poste of the contact in the list 
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
 2013-08-29 10:32:28 +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
42f165af15 Export module : Allow user define "field as field name" 2013-08-28 23:08:12 +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
Laurent Destailleur
e741ce9ea2 Merge pull request #1201 from FHenry/3.4 
Fix: Mailing module : if an email is already in destinaires list all
 2013-08-28 07:41:01 -07: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
Laurent Destailleur
cfa7b6ead9 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-08-28 13:13:22 +02:00
Laurent Destailleur
b39046ca7e Fix: Add missing syslog 2013-08-28 13:05:14 +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
7f549e60f2 Fix: Bad selection of years into graphics 2013-08-27 12:02:33 +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
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2013-08-27 09:36:54 +02:00
Laurent Destailleur
9cf2d8c556 Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter 
Update parameter as expected by the function name
 2013-08-26 14:12:30 -07:00
Laurent Destailleur
83c3bde1bd Merge pull request #1197 from grandoc/develop 
some fix for contract model and clean code
 2013-08-26 14:10:08 -07:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Grand Philippe
ed31c83fbb some fix for contract model 2013-08-26 15:42:01 +02:00
Grand Philippe
24e6042378 some fix for contract model 2013-08-26 15:32:56 +02:00
Grand Philippe
2591fa95f0 some trad for contract model 2013-08-26 15:07:36 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete 
service
 2013-08-26 14:39:35 +02:00
Grand Philippe
7a64ad1a26 some fix for contract model and clean code 2013-08-26 14:29:46 +02:00
simnandez
c78b0dbcc6 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 13:00:47 +02:00
Laurent Destailleur
9acc6bedbb Merge pull request #1196 from FHenry/develop 
Fix PgSQL upgrade process failed
 2013-08-26 03:43:13 -07:00
simnandez
a796337fc6 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 12:41:35 +02:00
simnandez
a9772edeff Trad: Add ca_ES and es_ES boxes translations 2013-08-26 12:31:41 +02:00
simnandez
8fa9e3251e Trad: Update ca_ES and es_ES translations 2013-08-26 12:17:11 +02:00
simnandez
68b4278ec6 Add ca_ES and es_ES workflow translations 2013-08-26 12:03:17 +02:00
simnandez
f5947abc71 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 11:49:22 +02:00
Florian Henry
5ea6518a6d Fix PgSQL upgrade process failed 2013-08-26 10:47:43 +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
Florian Henry
71ec4ea31c Merge remote-tracking branch 'origin/3.4' into 3.4 
Conflicts:
	ChangeLog

Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
 2013-08-21 17:32:52 +02:00
Florian Henry
ba4fde20ce Fix UserGroup name not display in card view or edit 2013-08-21 17:03:13 +02:00
Christophe Battarel
d4bf87aa77 fix old bug on reordering supplier products in list 2013-08-21 15:31:08 +02:00
Juanjo Menent
b6d998d1c5 Merge pull request #1185 from altatof/3.4 
fix old bug on reordering supplier products in list
 2013-08-21 06:27:22 -07:00
Christophe Battarel
9ac22149d4 fix old bug on reordering supplier products in list 2013-08-21 15:18:00 +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
1f05800909 Fix: [ bug #1037 ] Consumption> Supplier invoices related 2013-08-21 12:08:43 +02:00
simnandez
4e34e7b71c Fix: [ bug #1037 ] Consumption> Supplier invoices related 2013-08-21 12:06:02 +02:00
simnandez
b5e10a061b [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg
 2013-08-20 16:50:33 +02:00
simnandez
db46bc88ca [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg
 2013-08-20 16:10:01 +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
Juanjo Menent
002c3097c7 Merge pull request #1180 from FHenry/develop 
Add category into filter into webservice thirdparty method
 2013-08-20 00:29:27 -07:00
simnandez
9741b49b75 [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg
 2013-08-20 09:28:23 +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
Florian Henry
4932c116e0 fix mispelling 2013-08-15 12:50:16 +02:00
Florian Henry
472d218372 Add category into filter into webservice thirdparty method 
getListOfThirdParties
 2013-08-15 10:39:59 +02:00
simnandez
fa5f09d6e0 [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg: Works in admin
 2013-08-14 12:48:00 +02:00
simnandez
88356acc3a [ task #1036 ] Normalized usage of setEventMessage instead of 
dol_htmloutput_mesg: Init works in admin
 2013-08-14 11:11:49 +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
Florian Henry
d7d3aeff8f Fix canvas feature broken 2013-08-14 09:56:43 +02:00
Florian Henry
6cb274e25e Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7 2013-08-14 09:56:30 +02: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
Florian Henry
d6c7ac5f73 Fix canvas feature broken 2013-08-13 09:16:39 +02:00
Florian Henry
da565b2c7f Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7 2013-08-12 19:43:51 +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
34987d3e8b Exclude conf.php file from git 2013-08-10 13:02:13 +02:00
Laurent Destailleur
5c2e626338 More css3 2013-08-10 12:06:18 +02:00
Laurent Destailleur
5841edd40f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-10 02:40:29 +02:00
Laurent Destailleur
8e5537f1ce New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK. 2013-08-10 02:40:11 +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
simnandez
ee107a64b4 Trad: Update ca_ES dict.lang 2013-08-09 15:33:31 +02:00
simnandez
23be083637 Trad: Update ca_ES exports.lang 2013-08-09 15:31:40 +02:00