Laurent Destailleur
|
6dddcbfe49
|
Merge pull request #1763 from frederic34/patch-2
Update main.lang
|
2014-07-25 22:15:30 +02:00 |
|
Laurent Destailleur
|
aa33cc5f42
|
Merge pull request #1772 from atm-maxime/3.6
Mauvais libellé utilisé pour statut commande
|
2014-07-25 22:14:58 +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 |
|
Maxime Kohlhaas
|
393f32097b
|
class fichinterligne was not extending common object => error with trigger call
|
2014-07-25 13:57: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 |
|
Maxime Kohlhaas
|
948bcaaad7
|
Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop
|
2014-07-24 09:03:21 +02:00 |
|
Maxime Kohlhaas
|
108cf11c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2014-07-24 09:01:54 +02:00 |
|
Maxime Kohlhaas
|
d2b2f29e4b
|
Start to replace all $conf->entity by getEntity()
|
2014-07-24 09:01:47 +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 |
|
Laurent Destailleur
|
a2760aeacb
|
Typo
|
2014-07-23 10:26:43 +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
|
280ecf1243
|
Merge remote-tracking branch 'upstream/3.6' into changelog
|
2014-07-23 06:25:21 +02:00 |
|
Marcos García de La Fuente
|
f31f0cc0a9
|
Updated changelog for 3.6
|
2014-07-23 06:25:12 +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
|
37c7d05a9e
|
Added missing return null for getStaticMember
|
2014-07-22 04:46: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 |
|
Marcos García de La Fuente
|
097e8d33a2
|
Removed PHP 5.3 comparison in ImportCsv
|
2014-07-22 04:16:32 +02:00 |
|
Marcos García de La Fuente
|
31adeb7477
|
Deprecated getStaticMember
|
2014-07-22 04:12:45 +02:00 |
|
Marcos García de La Fuente
|
76725c61ed
|
Created test for dol_nl2br
|
2014-07-22 04:10:42 +02:00 |
|
Marcos García de La Fuente
|
9b3e65d80f
|
Removed PHP 5.3 comparison in dol_nl2br function
|
2014-07-22 04:07:33 +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
|
94e1f41849
|
Merge pull request #3 from eldy/revert-1-scrutinizer-patch-1
Revert "Scrutinizer Auto-Fixes"
|
2014-07-21 19:08:11 +02:00 |
|
Laurent Destailleur
|
161f5eadd4
|
Revert "Scrutinizer Auto-Fixes"
|
2014-07-21 19:07:56 +02:00 |
|
Laurent Destailleur
|
d5ab896782
|
Merge pull request #2 from eldy/scrutinizer-patch-2
Scrutinizer Auto-Fixes
|
2014-07-21 19:04: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 |
|
Florian HENRY
|
8b8615c13b
|
changelog
|
2014-07-21 08:38:23 +02:00 |
|
Florian HENRY
|
cf63f1a40d
|
Remane contract ref_ext to ref_supplier
|
2014-07-21 08:36:59 +02:00 |
|
Florian HENRY
|
5309fb380b
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
|
2014-07-21 08:14:15 +02:00 |
|