lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,768 Commits 43 Branches 150 Tags 886 MiB
c70a7ee63a
Commit Graph

36767 Commits

Author SHA1 Message Date
Laurent Destailleur
8bc655b44f Fix: Bad alignement of cells 2014-07-20 19:35:00 +02:00
Laurent Destailleur
5572364d2b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-07-20 16:09:42 +02:00
Laurent Destailleur
8d46b02d67 Fix: missing property 2014-07-20 15:58:05 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
d7163fe543 Qual: Start to fight deprecated code use reported by 
https://scrutinizer-ci.com/g/eldy/dolibarr/issues/develop?orderField=path&order=asc
 2014-07-20 15:34:33 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag 
Fix: Solve a lot of checkstyle errors.
 2014-07-20 15:27:38 +02:00
Laurent Destailleur
ad104470d8 Fix: CheckStyle 2014-07-20 14:55:18 +02:00
Laurent Destailleur
bd095f597d Fix: CheckStyle 2014-07-20 14:54:30 +02:00
Laurent Destailleur
ecd99608c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-20 05:14:45 +02:00
Laurent Destailleur
f6b8017386 Fix: PHPCS 2014-07-20 05:14:22 +02:00
Laurent Destailleur
bf926cd791 Merge pull request #1756 from marcosgdf/messages 
Migrated old message notifications to the """new""" system
 2014-07-20 04:57:09 +02:00
Laurent Destailleur
3451276b8b Merge pull request #1755 from marcosgdf/translation-taxes 
Corrected VAT expenses behaviour name
 2014-07-20 04:56:02 +02:00
Laurent Destailleur
c289e8a23d Merge pull request #1754 from ndrosis/patch-3 
Fix Link product, In list view and label product
 2014-07-20 04:54:48 +02:00
Laurent Destailleur
f46db55f71 Merge pull request #1753 from marcosgdf/triggers-refactor 
Refactored Dolibarr triggers
 2014-07-20 04:52:27 +02:00
Laurent Destailleur
5be7e75fe6 Merge pull request #1752 from marcosgdf/doactions-supplier 
Added missing doActions for supplier order fiche.php
 2014-07-20 04:49:27 +02:00
Laurent Destailleur
6499c4ff70 Merge pull request #1750 from nicoplh/patch-1 
Update impayees.php
 2014-07-20 04:45:47 +02:00
Laurent Destailleur
ffe7b531a6 Merge pull request #1746 from marcosgdf/patch-1 
Removed @ operator from dol_include_once
 2014-07-20 04:43:38 +02:00
Laurent Destailleur
d80de2cdd4 Fix: Clean before adding foreign key 2014-07-20 04:42:05 +02:00
Laurent Destailleur
a74b65df0e Fix: Add max height to solve pb with very large logo. 2014-07-20 04:29:47 +02:00
Laurent Destailleur
8137fd7fe4 Fix: Type of line (product/service) could not be edited on supplier 
order/invoice.
 2014-07-20 02:36:03 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Laurent Destailleur
a9779ca1ff Fix: bad colspan for line with date selector 2014-07-20 02:18:21 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Laurent Destailleur
109ccf9b74 Fix: SQL syntax error with pgsql 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2014-07-19 22:40:53 +02:00
Laurent Destailleur
d87e146e47 Fix: Navigation into agenda tabs 2014-07-19 22:37:18 +02:00
Laurent Destailleur
04a20d2008 - New: Enable feature developed for 3.6 we forgot to enabled: Adding 
prefix on uploaded file names. 
- New: No more dependency between contract and service module.
 2014-07-19 22:05:35 +02:00
Laurent Destailleur
b42a33b203 Fix: For contract, only services available by default. Product appears 
if option is set only.
 2014-07-19 21:14:56 +02:00
Laurent Destailleur
8156b1400b Fix: SQL syntax error with pgsql 2014-07-19 20:45:02 +02:00
Laurent Destailleur
8e9d760903 Fix: add curl_setopt($cHandler, CURLOPT_SSL_VERIFYHOST, false); 2014-07-19 16:47:51 +02:00
Laurent Destailleur
6637ea51e3 Fix: [ bug #1534 ] Unknown error when deleting a product photo under 
special circumstances
 2014-07-19 16:41:14 +02:00
Laurent Destailleur
7a8f244ae9 Fix: Translation 2014-07-19 16:03:55 +02:00
Marcos García de La Fuente
7794101e10 Corrected VAT expenses behaviour name 2014-07-19 05:36:29 +02:00
Laurent Destailleur
a6992e116b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
 2014-07-18 23:24:39 +02:00
Laurent Destailleur
dbae31b982 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-18 20:17:18 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Laurent Destailleur
44e57ca08a Fix: Seach on company was not working 2014-07-18 18:21:09 +02:00
nicoplh
2cfc5f10a8 Update impayees.php 
remove useless type alpha.
 2014-07-18 14:47:23 +02:00
Drosis Nikos
4f0d01d5c5 Fix Link product, In list view and label product 
This Fix added and develop.
 2014-07-18 14:36:46 +03:00
Marcos García de La Fuente
e2912b5f7f Accidentally removed Demo trigger content 2014-07-18 07:10:05 +02:00
Marcos García de La Fuente
5c59d291ce Corrected CS errors 2014-07-18 04:16:34 +02:00
Marcos García de La Fuente
f8f9e0355c Refactor InterfaceActionsAuto 2014-07-18 04:10:43 +02:00
Marcos García de La Fuente
f7c1203d4c Refactored InterfaceNotification class 2014-07-18 03:29:20 +02:00
Marcos García de La Fuente
cbd10106b8 Added missing $error and $errors variables 2014-07-18 03:17:05 +02:00
Marcos García de La Fuente
7e29889eab Fixed little bug 2014-07-18 03:13:15 +02:00
Marcos García de La Fuente
dfd8b5e20c Converted some global variables to local ones in InterfaceLogevents 2014-07-18 03:11:28 +02:00
Marcos García de La Fuente
c11431177c Fixed trigger not returning anything under some circumstances 2014-07-18 03:04:01 +02:00
Marcos García de La Fuente
2f68afaff3 Removed useless code 2014-07-18 03:02:28 +02:00
Marcos García de La Fuente
c8338f45c4 Refactored Dolibarr triggers: 
Created a DolibarrTriggers abstract class.
Moved common variables out of construct class
Improved run_trigger method signature
 2014-07-18 02:59:46 +02:00
Marcos García de La Fuente
63585ea9ca Added missing doActions for supplier order fiche.php 2014-07-18 01:32:54 +02:00
Marcos García de La Fuente
bcafa2c790 Corrected file_exists check and little refactor 2014-07-17 21:44:59 +02:00
Marcos García de La Fuente
37d4d303b3 Updated is_ip comment and added a test for is_ip function 2014-07-17 21:19:03 +02:00
Marcos García de La Fuente
cdc40ca76f Optimized is_ip dolibarr function 2014-07-17 21:12:50 +02:00
nicoplh
25a591bd03 Update impayees.php 
Add column ref.Client with search module.
 2014-07-17 16:21:23 +02:00
Juanjo Menent
2564413a70 Fix: Translation 2014-07-17 11:44:10 +02:00
Juanjo Menent
6e1f6f7485 Trad: Update es_ES from transifex 2014-07-17 11:14:47 +02:00
Laurent Destailleur
ef2629d309 Fix: Translation 2014-07-17 02:02:35 +02:00
Laurent Destailleur
9394f3f405 Fix: Translation 2014-07-17 01:56:34 +02:00
Laurent Destailleur
1bad6ebc78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-17 01:29:30 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Laurent Destailleur
6a19cc614a Merge pull request #1737 from GPCsolutions/accessibility 
Accessibility
 2014-07-16 15:15:03 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +02:00
Laurent Destailleur
f096253a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-15 23:28:58 +02:00
Laurent Destailleur
0cb11a537d Fix: IP address of user was lost into paypal confirm email 2014-07-15 23:27:11 +02:00
Cedric
f38ab46928 correction typo 2014-07-15 19:02:43 +02:00
Marcos García de La Fuente
ad4512cb24 Avoiding include in case of unexisting file 2014-07-15 17:18:41 +02:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Laurent Destailleur
3a625ce6bf Merge pull request #1741 from marcosgdf/url-not-available 
Removed index.php and replaced them with blank index.html as it is more appropiate
 2014-07-14 23:20:32 +02:00
Laurent Destailleur
32a6d59b64 Merge pull request #1734 from FHenry/3.5 
Fix
 2014-07-14 23:13:03 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-07-14 23:11:33 +02:00
Laurent Destailleur
0bfc90ee9a Merge pull request #1744 from marcosgdf/bug-linkedprojects 
Fixed a bug introduced in commit 0916d2cf3b
 2014-07-14 23:05:16 +02:00
Cedric
dda17f4082 Security fix 2014-07-14 20:00:22 +02:00
Juanjo Menent
2ac088d60e Merge pull request #1739 from KreizIT/XssFix 
Security fix
 2014-07-14 19:58:48 +02:00
Juanjo Menent
2031cdfdd7 Merge pull request #1745 from ndrosis/patch-2 
Fix Link product
 2014-07-14 19:48:37 +02:00
Juanjo Menent
9410b18473 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:43:48 +02:00
Juanjo Menent
f8b5bac05c Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:40:18 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +02:00
Marcos García
8eced58ba0 Removed @ operator from dol_include_once 
Adding @ operator to include_once makes include errors untraceable, it shouldn't be there. Errors must be thrown so that we notice them. It is PHP configuration's choice to decide wether to log them or print them.
 2014-07-14 19:16:28 +02:00
Drosis Nikos
fcc0632beb In list view and label product 2014-07-14 17:18:31 +03:00
Drosis Nikos
1ae4341d57 Fix Link product 2014-07-14 16:53:12 +03:00
Marcos García de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Marcos García de La Fuente
4bc8e026b6 [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly 2014-07-13 19:51:44 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Cedric
d289306fa4 Security fix 2014-07-12 16:22:49 +02:00
Raphaël Doursenaud
94bcb0dc40 Labels and autofocus for company card forms 2014-07-12 14:45:23 +02:00
Raphaël Doursenaud
f1853c435b More labels and autofocus for thirdparty and contact forms 2014-07-12 12:04:39 +02:00
Juanjo Menent
d02814192f Qual: More intuitive if contract ref_ext we say ref. customer 
Visu: ref. customer is not required
 2014-07-12 10:56:13 +02:00
Florian HENRY
d0cc935cd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-12 10:16:08 +02:00
Juanjo Menent
893240ce21 Qual: Uniformize code. Errors 2014-07-12 09:48:10 +02:00
KreizIT
b6edde320b Conflict solved 2014-07-12 09:20:00 +02:00
Juanjo Menent
a209c0ba5b Merge pull request #1733 from defrance69/patch-7 
Update box_actions.php
 2014-07-12 08:28:09 +02:00
KreizIT
9c2aaf7d23 [ Task #1495 ] Add trigger LINECONTRACT_CREATE 2014-07-12 00:27:33 +02:00
KreizIT
ff19a87941 [Task #1481] Enable BILL_SUPPLIER_MODIFY trigger 2014-07-11 23:40:17 +02:00
Raphaël Doursenaud
1ab938895b Added autofocus to name on company creation 2014-07-11 20:05:45 +02:00
Raphaël Doursenaud
8a3fbf9533 Mutualized common code 2014-07-11 20:04:40 +02:00
Raphaël Doursenaud
78ce6c0b1c Added labels on form elements for company creation 2014-07-11 19:57:51 +02:00
Laurent Destailleur
2766b1d8f1 Add record for argentina but disabled by default. 2014-07-11 17:43:57 +02:00
Laurent Destailleur
185d478fc3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 17:36:32 +02:00
Laurent Destailleur
f1ef8b8faa Comment entries 2014-07-11 17:34:01 +02:00
Florian HENRY
33f293ae19 Use good translation 2014-07-11 16:12:31 +02:00
KreizIT
2d8fee8adb Refactor: COMPANY_* trigger 2014-07-11 16:09:07 +02:00
Florian HENRY
d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-07-11 16:09:01 +02:00
KreizIT
ca97c0bef3 Refactor: RESOURCE_* trigger 2014-07-11 16:06:06 +02:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +02:00
Florian HENRY
b9df48d48c Fix 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
 2014-07-11 15:53:31 +02:00
KreizIT
5093fecc60 Refactor: SUPPLIER_PRODUCT_BUYPRICE_ * trigger 2014-07-11 15:50:40 +02:00
KreizIT
42ef7149fd Refactor: BILL_SUPPLIER_* and LINEBILL_SUPPLIER_* trigger 2014-07-11 15:48:25 +02:00
KreizIT
bbdaa59921 Refactor: ORDER_SUPPLIER_* and LINEORDER_SUPPLIER_* trigger 2014-07-11 15:32:23 +02:00
KreizIT
b8499a80ec Refactor: LINK_* trigger 2014-07-11 15:08:01 +02:00
KreizIT
971ae8ae59 Refactor: TVA_* trigger 2014-07-11 15:01:51 +02:00
Laurent Destailleur
728ca22183 Merge pull request #1730 from GPCsolutions/accessibility 
Accessibility
 2014-07-11 14:57:02 +02:00
KreizIT
a7afb5bdae Refactor: PAIEMENT_SALARY_* trigger 2014-07-11 14:54:32 +02:00
KreizIT
c1a004106d Refactor: LOCALTAXE_* trigger 2014-07-11 14:47:44 +02:00
KreizIT
fc61cc9bfa Refactor: BILL_* and LINEBILL_* trigger 2014-07-11 14:36:13 +02:00
BENKE Charles
bbe400e01f Update box_actions.php 
Add popup action feature on homepage
 2014-07-11 14:21:36 +02:00
KreizIT
8e64ea274d Refactor: ORDER_* and LINEORDER_* trigger 2014-07-11 14:02:21 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661 New: Type of thirdparties can accept a country (to show list of types 
specific for a country).
 2014-07-11 13:56:35 +02:00
Laurent Destailleur
d167fb4fcd Wok on page to show events per users. 2014-07-11 13:55:15 +02:00
Raphaël Doursenaud
f6848e8655 Add label on search boxes 2014-07-11 13:26:02 +02:00
Raphaël Doursenaud
55d062784d Added labels on objectline form elements 2014-07-11 13:25:44 +02:00
Laurent Destailleur
a6c1cfca7e Fix: bad translation 2014-07-11 12:42:47 +02:00
Laurent Destailleur
5e75dd27e8 Merge pull request #1719 from frederic34/selectbank 
Select bank account for propal order and invoice
 2014-07-11 12:29:21 +02:00
Laurent Destailleur
5c81074483 Merge pull request #1709 from KreizIT/review_trig2 
Review trig2
 2014-07-11 12:27:43 +02:00
Laurent Destailleur
0cba9b8fae Merge pull request #1726 from atm-alexis/3.5 
FIX : Bad rank when a bill was made by multiple orders
 2014-07-11 12:25:50 +02:00
Laurent Destailleur
a8dbcf4d36 Merge pull request #1728 from fmarcet/develop 
New: Can have half day holiday
 2014-07-11 12:22:37 +02:00
Laurent Destailleur
9b35e0985f Merge pull request #1729 from GPCsolutions/gig 
Support gigaoctets of session memory
 2014-07-11 12:20:08 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
Florian HENRY
14e3aa8a02 Allow trigger call on update line (class ContratLine must extends 
CommonObject to have method call_trigger)
 2014-07-11 11:32:27 +02:00
Florian HENRY
c7d31f4570 [ task #1204 ] Add ref_int contract field 2014-07-11 11:26:54 +02:00
juanjo
fb3392a7b2 Trad: Update from Transifex 2014-07-10 19:49:20 +02:00
Raphaël Doursenaud
b206ceea9e Added label for captcha 2014-07-10 16:46:10 +02:00
Raphaël Doursenaud
4a57a2adcd Added HTML5 autofocus attribute to login form 2014-07-10 16:34:19 +02:00
Raphaël Doursenaud
d476ca4a68 Support gigaoctets of session memory 2014-07-10 15:01:37 +02:00
fmarcet
ab57c236be New: Can have half day holiday 
New: Add Spanish holidays
Fix: Holiday log shows nothing
 2014-07-10 12:06:09 +02:00
frederic34
742bdcb715 Set bank account for supplier invoices 2014-07-09 18:44:20 +02:00
frederic34
387d36e4b0 Ste bank account for supplier order 2014-07-09 18:00:21 +02:00
frederic34
8c7b8bba52 Merge remote branch 'upstream/develop' into selectbank 2014-07-09 10:07:49 +02:00
Laurent Destailleur
e659b9e693 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-09 00:30:23 +02:00
Laurent Destailleur
682d765de9 New: Add country iso code on 3 chars into table of countries. 2014-07-09 00:16:28 +02:00
Laurent Destailleur
32c15132df Fix: sql syntax error 2014-07-08 23:19:46 +02:00
frederic34
c8e6387e52 Merge remote branch 'upstream/develop' into selectbank 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-08 22:46:38 +02:00
Laurent Destailleur
8bad4a3c1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
	htdocs/install/mysql/tables/llx_product_batch.key.sql
 2014-07-08 22:45:31 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
e624049161 Fix: Pb with migration with pgsql 2014-07-08 22:12:20 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
frederic34
beb471980e Add fields for supplier order and invoice 2014-07-08 21:50:21 +02:00
Laurent Destailleur
2b83d3fda7 Fix: File for migration 3.5 to 3.6 was modified. 2014-07-08 21:44:55 +02:00