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
f794b820c3 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-26 17:30:41 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
45435b597e Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:18:19 +02:00
frederic34
0450498e2b Add restriction to combo box 2014-07-26 17:17:40 +02:00
Laurent Destailleur
c5b26fa42a Merge pull request #1769 from frederic34/patch-4 
Update llx_c_shipment_mode.sql
 2014-07-26 14:52:44 +02:00
Laurent Destailleur
234ba0ca1c Merge pull request #1770 from frederic34/patch-5 
Update propal.php
 2014-07-26 14:47:54 +02:00
Laurent Destailleur
2bec2b4bec Merge pull request #1774 from fappels/develop 
Fix on bugfix#1317, clean parameters missing
 2014-07-26 14:19:52 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
76d4dee411 Merge pull request #1751 from marcosgdf/optimization 
Optimized is_ip dolibarr function
 2014-07-26 14:05:14 +02:00
frederic34
5258c522ce Some cleaning 2014-07-25 23:20:19 +02:00
Francis Appels
df5d4795bf Fix on bugfix#1317, clean parameters missing 
Clean fk_parent before updating fk_parent
 2014-07-25 22:37:23 +02:00
Laurent Destailleur
5aa4d61afe Merge pull request #1773 from icfr/patch-1 
erreur de frappe
 2014-07-25 22:20:43 +02:00
Laurent Destailleur
f1d8f3cb8e Merge pull request #1768 from mika31/patch-1 
Webservice thirdparty / sale representative
 2014-07-25 22:18:57 +02:00
Laurent Destailleur
f9dc010b3c Merge pull request #1767 from frederic34/patch-1 
Update html.form.class.php
 2014-07-25 22:18:19 +02:00
Laurent Destailleur
ed47b27ed9 Merge pull request #1764 from frederic34/patch-3 
Update main.lang
 2014-07-25 22:17:23 +02:00
Laurent Destailleur
5caa7ccd13 Merge pull request #1765 from marcosgdf/patch-3 
Added formConfirm and doAction for supplier invoice card
 2014-07-25 22:17:09 +02:00
Laurent Destailleur
6dddcbfe49 Merge pull request #1763 from frederic34/patch-2 
Update main.lang
 2014-07-25 22:15:30 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
icfr
d61d4778fb erreur de frappe 2014-07-25 19:03:31 +02:00
frederic34
4fcff3e2e5 Select delivery method for order 2014-07-25 17:20:42 +02:00
Maxime Kohlhaas
36b634784b Fix : real delivery date on livraison was not displayed 2014-07-25 16:31:41 +02:00
Maxime Kohlhaas
386022947a Categorie class was fetching an object even if no param passed 2014-07-25 14:11:31 +02:00
Maxime Kohlhaas
2e18fa88d1 Mauvais libellé utilisé pour statut commande 2014-07-25 14:03:41 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
frederic34
add5328d8f Update propal.php 2014-07-24 18:07:22 +02:00
frederic34
2b3bd260c6 Update llx_c_shipment_mode.sql 2014-07-24 10:26:11 +02:00
frederic34
304e9d2c83 Update llx_c_shipment_mode.sql 
Update GLS tracking url
 2014-07-24 09:45:46 +02:00
mika31
f96f8384e6 Webservice thirdparty / sale representative 
Little patch to add capability to associate (one) sale representative on thirdparty creation.
 2014-07-23 20:23:37 +02:00
frederic34
5239620356 Update main.lang 2014-07-23 10:02:33 +02:00
frederic34
c28c6e578e Update main.lang 2014-07-23 10:00:32 +02:00
frederic34
5ef626813c Update html.form.class.php 2014-07-23 09:49:58 +02:00
Marcos García de La Fuente
f3cbe1beac Task #1511 and updated changelog 2014-07-23 06:20:17 +02:00
Marcos García de La Fuente
1a254b310e Merge remote-tracking branch 'upstream/develop' into optimization 
Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-22 04:42:50 +02:00
Marcos García de La Fuente
203dc5518a Merge branch 'develop' into optimization 2014-07-22 04:39:31 +02:00
Marcos García de La Fuente
f5d1d1563b Corrected indentation (again) 2014-07-22 04:27:41 +02:00
Marcos García de La Fuente
c813077f82 Corrected indentation 2014-07-22 04:25:44 +02:00
Marcos García de La Fuente
4f582609f4 Added formConfirm and doAction for supplier invoice card 2014-07-22 04:24:08 +02:00
Laurent Destailleur
76f72d5bcc Fix: pb with pgsql 2014-07-21 23:51:13 +02:00
Laurent Destailleur
0327738aa9 phpcs 2014-07-21 21:07:30 +02:00
frederic34
a01c985018 Update main.lang 2014-07-21 19:21:08 +02:00
frederic34
f0bfe46ebc Update main.lang 2014-07-21 19:19:04 +02:00
Laurent Destailleur
8613cdf24a Merge pull request #1762 from eldy/develop 
A smaller PR from scrutinizer with good advices on doc
 2014-07-21 19:10:10 +02:00
Laurent Destailleur
161f5eadd4 Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
Laurent Destailleur
c024037c62 Merge pull request #1761 from frederic34/patch-1 
Update facture.php
 2014-07-21 19:01:25 +02:00
Scrutinizer Auto-Fixer
42a4af3b6e Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/dce98b05-0037-4277-b1e9-7fd6405a6cd6

Enabled analysis tools:
 - PHP Analyzer
 2014-07-21 18:42:17 +02:00
Juanjo Menent
acaca341ab Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders

Conflicts:
	ChangeLog
 2014-07-21 17:00:59 +02:00
Juanjo Menent
8cd2e00e5f Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders
 2014-07-21 16:57:08 +02:00
frederic34
f08f4d7c5e Update facture.php 
Remove a space
 2014-07-21 09:18:14 +02:00
Scrutinizer Auto-Fixer
2fdda8cbfb Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/128b4bb3-f689-4974-8fd7-a7b93d012d3f

Enabled analysis tools:
 - PHP Analyzer
 2014-07-20 23:46:38 +02:00
Laurent Destailleur
7ac4a6f43c New: Show amount and status of supplier invoice also on document tab. 2014-07-20 19:35:45 +02:00
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