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

45490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud Aujon Chevallier
da8aaea343 Merge remote branch 'upstream/3.7' into 3.7-webservices-fix 2015-05-05 21:37:50 +02:00
Arnaud Aujon Chevallier
4fd8d6c05a fix typo 2015-05-05 21:37:10 +02:00
Arnaud Aujon Chevallier
d020c4133a webservice_order : return all necessary fields 2015-05-05 10:26:05 +02:00
Arnaud Aujon Chevallier
8b753dc743 fix typo 2015-05-05 10:05:13 +02:00
Arnaud Aujon
d27934419c fix log 2015-05-04 11:36:53 +02:00
Arnaud Aujon
d8027bd71d add thirdparty_id to get invoice 2015-05-04 11:36:40 +02:00
Arnaud Aujon
ef08283bbd Merge branch '3.7-webservices-fix' of https://github.com/aaujon/dolibarr into 3.7-webservices-fix 2015-05-04 10:36:17 +02:00
Arnaud Aujon
4e10b94b6b Add webservice method createInvoiceFromOrder 2015-04-25 00:38:32 +02:00
Arnaud Aujon
fa9cb49fcb add updateInvoice webservice call 2015-04-24 23:42:35 +02:00
Arnaud Aujon
918d59b0d4 fix updateOrder result values 2015-04-24 23:41:54 +02:00
Arnaud Aujon
13cfae2eb6 payment_mode_id should be in Invoice not InvoiceLine 2015-04-24 23:02:59 +02:00
Arnaud Aujon
c0506918b6 Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix 2015-04-24 21:34:57 +02:00
Laurent Destailleur
1fcf10fd8a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-23 13:55:08 +02:00
Laurent Destailleur
c97c5e0cfd Fix selection of user was lost 2015-04-23 13:54:49 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +02:00
Laurent Destailleur
47ecb91a3e Avoid DOS attack when high number of tasks 2015-04-22 21:17:49 +02:00
Laurent Destailleur
7f5377d219 Fix #2695 2015-04-22 19:25:20 +02:00
Laurent Destailleur
12d841f27d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-22 14:58:39 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Arnaud Aujon
97fc99517e Fixes : contact webservice fix update using ref_ext 2015-04-22 12:47:45 +02:00
Arnaud Aujon
54ffaea000 Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix 2015-04-22 12:33:53 +02:00
Laurent Destailleur
8555691c04 Merge pull request #2680 from marcosgdf/bug-1897-hook 
[ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on
 2015-04-21 11:12:29 +02:00
Arnaud Aujon
afc4d89c64 Orders webservice : Generate pdf document on valid 2015-04-20 20:18:17 +02:00
Marcos García de La Fuente
ad5dd8e70f [ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on 2015-04-20 01:36:48 +02:00
Laurent Destailleur
349ce5c18f Merge pull request #2672 from atm-maxime/3.7 
Fix : prevelement with SEPA
 2015-04-19 01:59:54 +02:00
Maxime Kohlhaas
54a68116e4 Fix : prevelement with SEPA 2015-04-19 01:55:35 +02:00
Laurent Destailleur
b7ffdba55f Merge remote-tracking branch 'origin/3.6' into 3.7 2015-04-19 01:00:48 +02:00
Laurent Destailleur
fdd34c582c Merge pull request #2665 from atm-maxime/3.6 
Fix : include facture class for outstanding bill
 2015-04-19 00:59:21 +02:00
Maxime Kohlhaas
5a66e1f98a Fix : include facture class for outstanding bill 2015-04-19 00:26:05 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/expedition/fiche.php
 2015-04-18 23:55:17 +02:00
Laurent Destailleur
b8c512a3d5 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2015-04-18 23:34:42 +02:00
Laurent Destailleur
be9ddb7748 Merge pull request #2595 from marcosgdf/bug-2576 
Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref
 2015-04-18 22:24:21 +02:00
Marcos García de La Fuente
37d8dafd40 Merge branch '3.5' into bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 21:44:24 +02:00
Laurent Destailleur
4de4c66bb7 git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5 2015-04-18 20:56:40 +02:00
Laurent Destailleur
ed6abb0f79 Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 20:56:27 +02:00
Laurent Destailleur
e49a46a386 Merge pull request #2653 from atm-maxime/3.6 
Fix : menu financial was not displayed when only supplier module is acti...
 2015-04-18 20:30:24 +02:00
Laurent Destailleur
5f49b2a9bb git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5 2015-04-18 20:12:49 +02:00
Laurent Destailleur
b7cf0ded00 Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 
Conflicts:
	ChangeLog
 2015-04-18 20:12:27 +02:00
Maxime Kohlhaas
7b035d3b5f Fix : menu financial was not displayed when only supplier module is activated 2015-04-18 20:11:19 +02:00
Laurent Destailleur
b75722d450 git push origin 3.5Merge branch 'marcosgdf-bug-2583' into 3.5 2015-04-18 20:10:41 +02:00
Laurent Destailleur
9b69b64626 Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 
Conflicts:
	ChangeLog
 2015-04-18 20:10:06 +02:00
Laurent Destailleur
4201cf9f7f Merge pull request #2638 from atm-maxime/fix_cust_outstanding 
Fix cust outstanding
 2015-04-18 18:56:23 +02:00
Laurent Destailleur
7375256b99 Merge pull request #2643 from atm-maxime/3.6 
Fix : price in editkeyval function was forcing a price rounding
 2015-04-18 18:49:40 +02:00
Maxime Kohlhaas
51522decf3 Fix : price in editkeyval function was forcing a price rounding 2015-04-18 18:33:46 +02:00
Maxime Kohlhaas
8b307aac56 Fix : customer outstanding was not calculated properly 2015-04-18 18:06:27 +02:00
Maxime Kohlhaas
e0af2feced Fix : on impayees remain to pay did not include deposits 2015-04-18 18:06:02 +02:00
Laurent Destailleur
64244a009d Merge pull request #2634 from tiaris/3.7_mailing_user_bug 
Fix #2589
 2015-04-18 17:45:11 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended 
through a script parameter
 2015-04-18 16:39:53 +02:00
Laurent Destailleur
0000043c96 Merge pull request #2629 from atm-maxime/3.5_fix_shipment_model 
Fix : shipment model selection
 2015-04-18 15:23:52 +02:00