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

41825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphaël Doursenaud
ba8676dc61 Install: unlimitted memory is ok 2014-05-19 14:33:39 +02:00
Laurent Destailleur
39ce76ba1b Sync from transifex 2014-05-18 12:25:20 +02:00
Laurent Destailleur
4f52f22735 Fix: Run script from correct dir 2014-05-18 12:06:09 +02:00
Laurent Destailleur
01e3e13865 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	test/phpunit/DateLibTzFranceTest.php
	test/phpunit/ModulesTest.php
 2014-05-18 11:59:51 +02:00
Laurent Destailleur
0e13ded641 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
 2014-05-18 11:57:18 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
fb9a0f224b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-18 11:33:23 +02:00
Laurent Destailleur
1012595ff2 Fix for 3.6 beta 2014-05-18 11:33:07 +02:00
Laurent Destailleur
ab337c7485 Merge pull request #1602 from atm-alexis/3.5 
FIX alert for customer order wasn't on delivery_date if exist
 2014-05-16 09:58:56 +02:00
Laurent Destailleur
6bfff8b2b8 Merge pull request #1603 from marcosgdf/bug-1393 
Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
 2014-05-16 09:58:26 +02:00
Laurent Destailleur
5dffa919ce Merge pull request #1601 from atm-alexis/Shipping_you_cannot_change_the_size_of_the_package 
Add possibility to change package dimension after shipping creation
 2014-05-16 09:58:01 +02:00
Laurent Destailleur
add02b224e Merge pull request #1599 from FHenry/develop 
Add url column into llx_product into initdata for 3.6
 2014-05-16 09:55:04 +02:00
Laurent Destailleur
376101c8b6 Merge pull request #1600 from guerinaxel/patch-2 
Missing include contrat.class.php
 2014-05-16 09:54:29 +02:00
Marcos García de La Fuente
39b0ed7fc2 Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice. 2014-05-14 22:47:19 +02:00
Alexis Algoud
fa212438c6 FIX alert for customer order wasn't on delivery_date if exist 2014-05-14 18:51:02 +02:00
Alexis Algoud
4e51963836 Add possibility to change package dimension after shipping creation 2014-05-14 17:20:11 +02:00
Florian HENRY
c57c7fdca6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-14 14:19:51 +02:00
guerinaxel
944e582c82 Missing include contrat.class.php 
Missing include for function calcul_price_total.
 2014-05-14 14:17:15 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Laurent Destailleur
fd271d7c92 Fix: Missing to set version to beta 2014-05-14 14:09:57 +02:00
Florian HENRY
ff454130de add tobatch into into data product 2014-05-14 12:58:20 +02:00
Florian HENRY
100628622a fix insert data from initdata3.6 form url column into llx_product 2014-05-14 12:53:06 +02:00
Laurent Destailleur
f7d1e93136 Move module to status development 2014-05-14 12:27:09 +02:00
Laurent Destailleur
9ae9f062ac Checkstyle 2014-05-14 12:25:30 +02:00
Laurent Destailleur
15796ec592 Fix: checkstyle errors 2014-05-14 12:19:45 +02:00
Laurent Destailleur
0027dc30f5 Fix: Modules into core should never, by definition, activate hooks 
(hooks are architecture solution for external module)
 2014-05-14 12:14:18 +02:00
guerinaxel
4fc818d329 Correcting var name 
Correcting var name for contrat updateline
 2014-05-14 11:56:30 +02:00
Laurent Destailleur
ce82216879 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-14 11:55:14 +02:00
Laurent Destailleur
97304fef21 Merge pull request #1598 from guerinaxel/patch-1 
Correcting var name
 2014-05-14 11:53:22 +02:00
Florian HENRY
af9fd7cabd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-14 11:50:13 +02:00
Florian HENRY
9cd8b3a2b7 Add url column into llx_product into initdata for 3.6 (else phpunit is 
not happy)
 2014-05-14 11:49:54 +02:00
Laurent Destailleur
525e41aa63 Merge pull request #1597 from defrance69/patch-10 
Update fiche.php
 2014-05-14 11:49:35 +02:00
Laurent Destailleur
6cebccf1b4 Merge pull request #1596 from marcosgdf/lang-35 
Corrected untranslated string when creating invoice linked to a supplier order
 2014-05-14 11:47:35 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
0f43b5ccd4 Update test file 2014-05-14 11:42:34 +02:00
Laurent Destailleur
4a347236ee Merge pull request #1594 from atm-alexis/develop 
Add detailled view in supplier order as in customer order
 2014-05-14 11:40:49 +02:00
Laurent Destailleur
d7d8eba6b1 Merge pull request #1592 from atm-alexis/3.5_adding_page_to_list_product_as_other_list 
Fix page numerotation for product, invoice and others as in company list
 2014-05-14 11:26:22 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Laurent Destailleur
8ab09d63a2 Fix: Rss features 2014-05-14 11:16:12 +02:00
Florian HENRY
eb8eca5f9d Suplier Order, do not insert line if error with missing fields 2014-05-14 10:55:27 +02:00
guerinaxel
e0a3e79dda Correcting var name 
Correcting var name for contrat updateline
 2014-05-14 10:23:03 +02:00
BENKE Charles
c528613620 Update fiche.php 
Adds the constant MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER for those who need to use the ref_client of the propal in the order
 2014-05-14 09:46:49 +02:00
Marcos García de La Fuente
98bd78a277 Corrected untranslated string when creating invoice linked to a supplier order 2014-05-14 01:07:07 +02:00
Florian HENRY
fb277bbbab fix llx_societe.datea call in request 2014-05-13 19:32:04 +02:00
Florian HENRY
45c96e169f fix install 2014-05-13 19:17:50 +02:00
Florian HENRY
1f1a9e46fd Fix warning 2014-05-13 19:12:14 +02:00
Florian HENRY
a421d9f60f Fix notice pgsql method 2014-05-13 18:54:57 +02:00
Florian HENRY
8274b49fc1 Avoid notice during PGSQL installation 
$unescapeslashquot
 2014-05-13 18:50:35 +02:00
Laurent Destailleur
179583f79a More info into comment 2014-05-13 18:30:51 +02:00
Laurent Destailleur
9b38857c9a Fix: When creating an invoice, we must first create it as draft and then 
after validate.
 2014-05-13 14:24:27 +02:00