Commit Graph

29206 Commits

Author SHA1 Message Date
Laurent Destailleur
cb95621d7e Merge pull request #455 from simnandez/develop
New: More import options. Thirds Bank Accounts
2012-10-19 10:27:41 -07:00
Laurent Destailleur
5a3be48d09 New: Can edit bookmark from list 2012-10-19 17:28:18 +02:00
Laurent Destailleur
ffa1b10061 doxygen 2012-10-19 14:45:00 +02:00
Laurent Destailleur
40a1ba3b96 Fix: Removed deprecated translation 2012-10-19 14:23:21 +02:00
Laurent Destailleur
4a10874f54 New: add waring message when date is too low. 2012-10-19 13:01:29 +02:00
simnandez
aa53b7a2ba New: More import options. Thirds Bank Accounts 2012-10-19 13:00:53 +02:00
Laurent Destailleur
70cf195fb4 Fix: removed test code 2012-10-19 09:34:31 +02:00
Laurent Destailleur
657d0197b6 Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails
without any warning when converting non utf8 strings).
2012-10-18 16:30:12 +02:00
Laurent Destailleur
0152e226c1 Fix: Use correct translation of fields 2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8 Merge pull request #453 from simnandez/develop
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
2012-10-18 03:31:55 -07:00
Regis Houssin
d705995a49 Fix: convert line delimiters 2012-10-18 10:36:53 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
4afdf2f2d2 Fix: [ bug #554 ] Firstname and lastname should not be mandatory for
corporate members.
2012-10-17 20:55:13 +02:00
Laurent Destailleur
97001951e6 New: Add field stock into product export 2012-10-17 20:32:57 +02:00
Laurent Destailleur
a41186b4c5 [ bug #70 ] Champ Stock toujours vide dans export produit 2012-10-17 20:30:17 +02:00
Laurent Destailleur
33540cb2e8 Repair not synchronized denormalized field. 2012-10-17 20:22:50 +02:00
Laurent Destailleur
319b512157 Fix: Avoid empty messages 2012-10-17 19:02:21 +02:00
simnandez
d7dcd3c14b New: More import options. Supplier Products 2012-10-17 19:02:12 +02:00
Laurent Destailleur
c4ce66d784 Enhance error management 2012-10-17 18:47:18 +02:00
Laurent Destailleur
0cfd336c03 better message 2012-10-17 17:53:25 +02:00
Laurent Destailleur
ef1e735ff9 Fix: doxygen 2012-10-17 17:19:28 +02:00
Laurent Destailleur
4c5d696bb7 Translations 2012-10-17 16:13:06 +02:00
Laurent Destailleur
6803c68ebf Fix: Bad date format 2012-10-17 15:53:45 +02:00
Laurent Destailleur
796b0fc12c New: Enhance guide for new users to say how to start setup. 2012-10-17 15:19:43 +02:00
Laurent Destailleur
8ac375145d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-17 15:07:33 +02:00
Laurent Destailleur
4d5a6c6f01 Typo error 2012-10-17 15:07:13 +02:00
Laurent Destailleur
773b2ead35 Merge pull request #454 from cbattarel/develop
correct bug in price delete
2012-10-17 06:01:26 -07:00
Laurent Destailleur
bbedddf992 Fix: Removed warning 2012-10-17 14:53:05 +02:00
Laurent Destailleur
01bd20147e Fix: Some fixes and enhancement into modularizing log functions 2012-10-17 14:46:20 +02:00
Christophe Battarel
8f08d7a166 add entity in the unique key for delete 2012-10-17 14:25:43 +02:00
Laurent Destailleur
b160b97cbe New: Add warning message. 2012-10-17 14:23:56 +02:00
Laurent Destailleur
5e510d4312 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-17 14:15:27 +02:00
Laurent Destailleur
c56e3b5c90 Fix: Migration error 2012-10-17 14:15:11 +02:00
Laurent Destailleur
4a913cfb38 Merge pull request #449 from marcosgdf/odt-discounts
Created function to retrieve total discounted amount of a commonobject
2012-10-17 05:03:55 -07:00
Laurent Destailleur
05ca191335 Merge pull request #451 from marcosgdf/syslog
Created a modular syslog handler system
2012-10-17 05:03:14 -07:00
Laurent Destailleur
0dffe08c07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-17 13:12:02 +02:00
Christophe Battarel
e8b92cc2c5 correct bug in price delete 2012-10-17 12:47:40 +02:00
Laurent Destailleur
0a97ce71e5 Add gg flag 2012-10-17 12:40:10 +02:00
simnandez
23d3b6a783 New: More import options. Supplier Products 2012-10-17 12:36:30 +02:00
simnandez
6f430cc630 New: More import options. Supplier Products 2012-10-17 11:43:26 +02:00
simnandez
cf814dc7fd New: More import options. Categories
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:42:16 +02:00
simnandez
2cf88e7847 New: More import options. Categories
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:40:17 +02:00
Laurent Destailleur
099bf034af Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-16 19:51:12 +02:00
Laurent Destailleur
4854c72348 Fix: [ bug #565 ] Display error bills have suppliers. 2012-10-16 19:15:36 +02:00
Laurent Destailleur
7bf5663096 Fix: [ bug #552 ] l'option "Adhérents non à jour" ne fonctionne pas 2012-10-16 18:33:49 +02:00
Regis Houssin
15aa2497ab Fix: compatibility with multicompany sharings 2012-10-16 17:59:00 +02:00
Regis Houssin
26a5ac53d7 Fix: possibility to disable ajax 2012-10-16 16:10:23 +02:00
Marcos García
3c051abc22 Orders and proposals should also replace {object_total_discount} 2012-10-16 13:43:50 +02:00
Marcos García
ac4ee01723 mod_syslog_syslog class shouldn't be active if openlog is not available 2012-10-16 13:39:23 +02:00
Marcos García
df2262f8be Stopped using (un)serialize functions but json functions 2012-10-16 12:18:05 +02:00
Marcos García
180eddff49 Because the rest of the class is using SYSLOG_CHROMEPHP_INCLUDEPATH it needs to be restored... 2012-10-16 02:25:48 +02:00
Marcos García
f250bb41e9 Removed unnecessary comments and commented unused config variables 2012-10-16 02:13:38 +02:00
Marcos García
07dcb07fd2 Created a modular syslog handler system
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
2012-10-16 02:01:37 +02:00
Marcos García
da94ec8fa4 Normalized thirdparties module card name 2012-10-16 01:36:42 +02:00
Laurent Destailleur
5dff8dbc6d New: Avoid horizontal scroll on standard resolution. 2012-10-15 23:13:28 +02:00
Laurent Destailleur
e34cdb76e8 Fix: Translation 2012-10-15 23:02:52 +02:00
Laurent Destailleur
df3c1ca644 Fix: Showing rate 2012-10-15 22:13:39 +02:00
Laurent Destailleur
7a7e2b6873 Fix: Error management 2012-10-15 21:42:17 +02:00
Laurent Destailleur
0dbc7ebb25 Fix: error management 2012-10-15 21:31:46 +02:00
Laurent Destailleur
354e673d92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-15 20:54:11 +02:00
Laurent Destailleur
6f93e9cdac Fix: Can delete even if data corrupted (fk_bank set but entry removed
manually into llx_bank).
2012-10-15 20:53:49 +02:00
Marcos García
c9944a6b9b Created function to retrieve total discounted amount of a commonobject
Also added an ODT tag to let people add it to their invoices, etc..
2012-10-15 00:49:39 +02:00
Marcos García
59e8964bc5 Fixed PHP warning on MailmanSPIP module
Also simplified the code and removed unused variables from it
2012-10-14 23:56:28 +02:00
Laurent Destailleur
70ae16f89e Merge pull request #447 from simnandez/develop
New: More import options. Warehouses
2012-10-14 14:43:35 -07:00
Laurent Destailleur
118ec8277b Fix: Old data store 2012-10-14 13:27:18 +02:00
Laurent Destailleur
325d47c882 Fix: Creation of notes was not using DolEditor class. 2012-10-14 13:18:52 +02:00
simnandez
6f799f8e16 New: More import options. Warehouses 2012-10-13 18:02:43 +02:00
Laurent Destailleur
153997432f Fix: Several fix.
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
2012-10-13 17:00:38 +02:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Laurent Destailleur
ac38954c17 Fix: Regression selectlang choice
Fix: Regression conf file was not saved successfully.
2012-10-13 13:56:37 +02:00
Laurent Destailleur
2a8095f3de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-13 13:03:57 +02:00
Laurent Destailleur
7385ea15db Doxygen 2012-10-13 13:03:39 +02:00
Regis Houssin
df1e4a401a Fix: convert line delimiters
Info: the last Eclipse version fix this problem
2012-10-13 11:42:58 +02:00
Regis Houssin
a12d453d38 Fix: security 2012-10-13 11:41:17 +02:00
Regis Houssin
67f40fcd1e Fix: works on security 2012-10-13 10:39:16 +02:00
Laurent Destailleur
091966902e Fix: for special_code=3 2012-10-12 22:18:31 +02:00
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Laurent Destailleur
6a7a982688 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-10 15:07:41 +02:00
Laurent Destailleur
4aebaf22ae Fix: Avoid wrap on amount 2012-10-10 15:06:02 +02:00
Regis Houssin
10bd942328 Fix: customer ref is very important for a best traceability 2012-10-10 12:04:08 +02:00
Regis Houssin
62f170d3d7 Fix: add escape 2012-10-09 20:23:02 +02:00
Regis Houssin
edb6195cc2 Fix: add similitude test 2012-10-09 20:08:54 +02:00
Regis Houssin
925af263fc Fix: best test 2012-10-09 18:54:21 +02:00
Regis Houssin
3abb1b88ff Fix: best method 2012-10-09 18:33:02 +02:00
Regis Houssin
6791d23032 Fix: use asterisk for define the percentage 2012-10-09 18:21:12 +02:00
Regis Houssin
a20f7094ef Fix: refactore 2012-10-09 18:11:51 +02:00
Regis Houssin
74dd4ce218 Fix: possibility to force the clause 2012-10-09 18:06:59 +02:00
Regis Houssin
337cb0faa5 Fix: add not exact method 2012-10-09 17:47:58 +02:00
Regis Houssin
9f43d8613c Fix: missing clean parameters 2012-10-09 16:59:19 +02:00
Regis Houssin
8486f9d85d Fix: missing spaces 2012-10-09 16:33:28 +02:00
Regis Houssin
7cde9ab668 New: add search method with case sensibility and filters 2012-10-09 15:49:42 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +02:00
Laurent Destailleur
4413613d14 Another better fix. 2012-10-09 11:56:39 +02:00
Laurent Destailleur
1725561c34 Better security fix: Using GETPOST does not fix all cases, also the real
bug (missing escaping information when using it) was not fixed.
2012-10-09 11:42:38 +02:00
Regis Houssin
72a1194d14 Fix: search with case sensitive method
FIXME: Mysql "LIKE" is case insensitive by default and use LIKE BINARY
for case sensitive, Pgsql "LIKE" is case sensitive by default, and use
ILIKE for case insensitive
2012-10-09 10:57:15 +02:00
Regis Houssin
a814ea7924 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-09 09:34:57 +02:00
Regis Houssin
4cd702bb1a Fix: prevent XSS and SQL injection 2012-10-09 09:34:12 +02:00
Regis Houssin
044ec61aba Merge pull request #446 from atm-maxime/develop
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-08 23:50:49 -07:00
Regis Houssin
bfee8553f0 Merge pull request #445 from atm-maxime/mko543
Bug # 543 and # 570 : contact address is now used in recipient block and...
2012-10-08 23:50:29 -07:00
Regis Houssin
d61a8ee947 Fix: missing comma 2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5 Fix: add import_key field 2012-10-09 08:40:32 +02:00
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
93d760e0fc Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-08 20:44:28 +02:00
Regis Houssin
7f7676d357 Fix: uniformize variable name 2012-10-08 20:44:12 +02:00
Laurent Destailleur
d51db70768 Missing translation 2012-10-08 20:25:03 +02:00
Laurent Destailleur
26f4b344cb Merge pull request #444 from cbattarel/develop
fix wrong update in previous commit
2012-10-08 10:55:33 -07:00
Regis Houssin
c35a1ebaf7 Fix: missing drop foreign key 2012-10-08 19:38:09 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-08 19:27:02 +02:00
Christophe Battarel
99b323e8d0 fix wrong update in previous commit
(it was always remaining on step 5 !)
2012-10-08 16:25:50 +02:00
Regis Houssin
67c41721f5 Merge pull request #443 from marcosgdf/translations
Minor changes to es_ES translations
2012-10-08 03:01:57 -07:00
Regis Houssin
88785a8fef Merge pull request #442 from cbattarel/develop
fix wrong last update in cleansep function
2012-10-08 03:01:34 -07:00
Marcos García
fed3c20548 Minor changes to es_ES translations 2012-10-08 11:44:55 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Marcos García
734b292440 Merge branch 'develop' into bug-569
Conflicts:
	htdocs/install/inc.php
2012-10-08 11:16:33 +02:00
Marcos García
8ed706e4ac Fixed bug #569 - Notices & Warnings when installing Dolibarr
Also translated a string & variable and improved html use
2012-10-08 02:45:58 +02:00
Laurent Destailleur
68ecc5eb89 Upgrade doliwamp 2012-10-08 02:38:30 +02:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg.
Fix: Debian package
2012-10-07 20:04:07 +02:00
Laurent Destailleur
566855d7e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
2012-10-06 23:15:10 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
430b63f4e1 Fix: Bad message 2012-10-06 22:54:23 +02:00
Laurent Destailleur
4789b5e2d1 Fix: Usage of specific mysql function is forbidden 2012-10-06 22:46:54 +02:00
Laurent Destailleur
053b4dd63c New: [ task #210 ] Can choose cash account during POS login 2012-10-06 21:47:59 +02:00
Laurent Destailleur
b2ec0a7669 Merge pull request #438 from simnandez/develop
Trad: Add ca_ES and es_ES translations
2012-10-06 11:16:23 -07:00
Laurent Destailleur
a659e6f9f7 More elegant position of button to aufofill fields. 2012-10-06 19:25:25 +02:00
simnandez
7faa90e831 New: More import options. Prepare database 2012-10-06 09:52:33 +02:00
simnandez
2d4957d415 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2012-10-06 09:38:09 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
simnandez
0e5cc34b1f Trad: Add ca_ES and es_ES translations 2012-10-05 18:50:30 +02:00
Regis Houssin
b1ad840055 Fix: optimize code 2012-10-05 15:12:17 +02:00
Regis Houssin
6b21ca442d New: add possibility to defined position/job of a user
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-05 12:40:19 +02:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
2012-10-05 08:30:09 +02:00
Regis Houssin
1b7f93fc29 Merge pull request #436 from simnandez/develop
Task # 104: Check if module invoice is active and user has creation permissions. Move creation invoice to action bar into customer card
2012-10-04 10:06:22 -07:00
Regis Houssin
6b50219999 Fix: add function for build $mysoc object 2012-10-04 18:54:56 +02:00
simnandez
f873198442 Fix: Warning into perms page 2012-10-04 18:40:05 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation
permissions. Move creation invoice to action bar into customer card
2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Maxime Kohlhaas
5a64e3b1ec Task # 104 : Commited these 2 files instead of translations files 2012-10-04 15:43:52 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
87d643d482 Task # 104 : translations 2012-10-04 15:36:38 +02:00
Maxime Kohlhaas
12128a6226 Task # 186 : Stock calculation on product, migration + update product 2012-10-04 15:25:34 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b Fix: Show message only when needed 2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
1f2b05fbc0 Fix: Can unset ChromePHP output 2012-10-03 18:40:24 +02:00