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

58645 Commits

Author SHA1 Message Date
Laurent Destailleur
4a58ae59ed Fix missing drop of old constraint on old table 2018-05-25 15:54:59 +02:00
Laurent Destailleur
10281169e6 Empty page first 2018-05-25 15:43:08 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
 2018-05-25 15:02:24 +02:00
Laurent Destailleur
b246034670 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 14:57:43 +02:00
Laurent Destailleur
ba6193cff7 Add indonesia provinces 2018-05-25 14:57:30 +02:00
Laurent Destailleur
943d1dce2e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-25 13:15:38 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty 
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
 2018-05-25 12:55:02 +02:00
Laurent Destailleur
bcbe28d802 Code comment 2018-05-25 12:48:33 +02:00
Laurent Destailleur
fa252d5cbd
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm 2018-05-25 11:59:22 +02:00
Laurent Destailleur
1a1f0fbc62
Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch 
FIX : Fetch shipping will now fetch project id
 2018-05-25 11:46:06 +02:00
Laurent Destailleur
aa65b3f9ba
Merge pull request #8830 from wdammak/patch-8 
Add liste_modeles to warehouse module
 2018-05-25 11:43:48 +02:00
Laurent Destailleur
9d407cdc03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3 Fix duplicate deprecated file 2018-05-25 11:26:50 +02:00
Laurent Destailleur
3d71ce8297
Update html.formfile.class.php 2018-05-25 11:19:38 +02:00
Laurent Destailleur
520ce99e56
Merge pull request #8828 from bgenere/develop 
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
 2018-05-25 11:17:45 +02:00
Laurent Destailleur
a3bea8d298
Update commonobject.class.php 2018-05-25 11:17:01 +02:00
Laurent Destailleur
131ddd6984
Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project 
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
 2018-05-25 11:12:39 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml 
new : add adv targt emailing amdin with main feature level 1
 2018-05-25 11:10:51 +02:00
Laurent Destailleur
cbe54e596b
Merge pull request #8817 from wdammak/patch-5 
Add generateDocument function to entrepot class
 2018-05-25 11:08:43 +02:00
Laurent Destailleur
c36187b46b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 11:08:19 +02:00
Laurent Destailleur
3d97fa36d1 CSS 2018-05-25 11:08:05 +02:00
Laurent Destailleur
22b1f2574e
Merge pull request #8851 from atm-florian/develop 
fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined
 2018-05-25 11:07:18 +02:00
Laurent Destailleur
ac0570f6b2
Update translate.class.php 2018-05-25 11:07:11 +02:00
Laurent Destailleur
001b94698a
Merge pull request #8832 from dtix/develop 
NEW Add romanian chart of accounts
 2018-05-25 11:05:59 +02:00
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice 
FIX : test is_erasable() must be done before call function delete()
 2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php 2018-05-25 11:04:04 +02:00
Laurent Destailleur
8303dc1e6f
Merge pull request #8815 from atm-florian/develop_fixproject 
NEW: add filter on project task list
 2018-05-25 10:56:10 +02:00
Laurent Destailleur
034752dc0b
Update tasks.php 2018-05-25 10:54:17 +02:00
Laurent Destailleur
e7cfad0e60
Update tasks.php 2018-05-25 10:52:24 +02:00
Laurent Destailleur
c56ef86bc3
Update project.lib.php 2018-05-25 10:50:16 +02:00
Laurent Destailleur
973384604e
Merge pull request #8850 from grandoc/new_branch_24_05_2018 
clean and update code
 2018-05-25 10:45:39 +02:00
Laurent Destailleur
fbcaf8872b
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody 
Add table thead and tbody for object lines
 2018-05-25 10:42:26 +02:00
Laurent Destailleur
04586fab66
Merge pull request #8824 from ggg44473/7.0 
Fix sql error accounting account
 2018-05-25 10:41:16 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26 
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
 2018-05-25 10:36:46 +02:00
Laurent Destailleur
205732e240
Merge pull request #8822 from aspangaro/8.0-b27 
Salaries : Move to LoadLangs
 2018-05-25 10:34:36 +02:00
Laurent Destailleur
f416f9629e
Merge pull request #8840 from all3kcis/patch-9 
Add oldcopy on productlot::update()
 2018-05-25 10:22:18 +02:00
Laurent Destailleur
5d5638d906
Merge pull request #8848 from frederic34/typo 
typo
 2018-05-25 10:14:41 +02:00
Laurent Destailleur
923fcfb36e
Merge pull request #8854 from glu000/develop 
FIX: It's not possible to remove a contact which is assigned to an event #8852
 2018-05-25 10:14:05 +02:00
Laurent Destailleur
76b34a5a60
Merge pull request #8857 from aspangaro/8.0-b28 
FIX : Replace feature level 2 by a constant on accountancy journal
 2018-05-25 10:13:20 +02:00
Laurent Destailleur
b9fbf13eba Fix look and feel v8 2018-05-25 09:36:49 +02:00
Laurent Destailleur
9f2f8ca7e0 Fix scrutinizer 2018-05-25 09:31:16 +02:00
Alexandre SPANGARO
46a251a2b3 FIX : Replace feature level 2 by a constant on accountancy journal 2018-05-24 21:13:48 +02:00
Alexandre SPANGARO
d1e1d64b42 Add some information in bank_journal 2018-05-24 20:26:38 +02:00
Alexandre SPANGARO
7d2d818679 Fix link 2018-05-24 20:25:06 +02:00
Günter Lukas
3adfce35e2
Update card.php 2018-05-24 13:32:13 +02:00
Günter Lukas
1b237a75b9
Update card.php 2018-05-24 13:31:23 +02:00
Laurent Destailleur
23e2bb20d9 Look and feel v8 2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Frédéric FRANCE
0623ff7667
fix logic 2018-05-24 11:56:19 +02:00
Laurent Destailleur
de447d88d7 Fix translation 2018-05-24 11:51:32 +02:00
florian HENRY
436a1001b3 fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL 
on upgrade.php page where global is not yet defined
 2018-05-24 10:56:01 +02:00
Philippe GRAND
11b63325bf clean and update code 2018-05-24 10:48:03 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Laurent Destailleur
3f24f5ef78 Fix css 2018-05-23 18:19:59 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2018-05-23 18:09:25 +02:00
Laurent Destailleur
4967c678b8 Fix translation 2018-05-23 18:05:19 +02:00
Laurent Destailleur
3a06918b16 FIX Missing extrafields in export of stock or products 2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
Frédéric FRANCE
1b69c2357f
typo 2018-05-23 17:16:58 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Marc de Lima Lucio
111f3a9649 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-05-23 11:11:33 +02:00
All3kcis
4bfd8b5539
Add oldcopy on productlot::update() 2018-05-23 10:38:24 +02:00
ATM-Nicolas
734ecbc9b5 FIX : Fetch shipping will now fetch project id 2018-05-23 09:47:29 +02:00
Laurent Destailleur
f58e0d3bcf Fix scrutinizer errors 2018-05-23 08:24:20 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
Laurent Destailleur
d072c2eb5d Fix turnover invoiced by vat rate and country. Use fiscal month start. 2018-05-22 23:09:27 +02:00
Laurent Destailleur
354198b31e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/contact.php
 2018-05-22 20:26:09 +02:00
Laurent Destailleur
f074daae48 Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT 2018-05-22 20:17:31 +02:00
Laurent Destailleur
2a579b707a FIX javascript showempty error 
FIX Contact tab not visible when using canvas
 2018-05-22 19:43:28 +02:00
Laurent Destailleur
be21405d21 Fix missing error message 2018-05-22 19:24:56 +02:00
Neil Orley
15e02c7082 NEW : adds billing contacts ids to REST API returns 
adds billing contacts ids to REST API returns for proposals, orders and invoices
 2018-05-22 11:40:32 +02:00
dtix
cca1d26943
Romanian chart of account added 2018-05-22 11:23:59 +03:00
dtix
63e056064e
Create llx_accounting_account_ro.sql 2018-05-22 11:22:04 +03:00
wdammak
1f43882bb7
Add liste_modeles to warehouse module 2018-05-22 01:09:52 +01:00
Laurent Destailleur
745aa4bd73 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 23:38:46 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
afa57fd66d Fix syntax error 2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493 Fix PSR True->true and GETPOST file name for local checksum check 2018-05-21 22:24:27 +02:00
Laurent Destailleur
e5561ecdfb Remove useless files 2018-05-21 22:14:15 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
bgenere
227539d647 FIX : showOptionals function is now consistent with template 
Extrafield_view.tpl.php for date and datetime fields

The jdate function is not called when not needed.
 2018-05-21 16:55:35 +02:00
Marc de Lima Lucio
c9222adf6d FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods 2018-05-21 16:22:06 +02:00
florian HENRY
dd946dd197 add ressource 2018-05-21 11:03:48 +02:00
florian HENRY
f5c245cd19 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject 2018-05-21 10:59:10 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Sean Wang
8e397b772f Fix sql error 2018-05-21 14:19:41 +08:00
Alexandre SPANGARO
4d3ce7a3d6 Fix buttons 2018-05-20 14:08:47 +02:00
Alexandre SPANGARO
3fd55585b7 Salaries : Move to LoadLangs 2018-05-20 08:00:42 +02:00
Alexandre SPANGARO
c41a9291f1 Fix some problems & presentation 2018-05-20 07:46:02 +02:00
Alexandre SPANGARO
a4d3c4bed0 Fix language 2018-05-20 06:16:12 +02:00
Alexandre SPANGARO
0b581fc507 loadLangs 2018-05-19 08:06:52 +02:00
Alexandre SPANGARO
1af4a857be Remove old code 2018-05-19 08:06:24 +02:00
wdammak
5fef8c2dc1
Add generateDocument function to entrepot class 2018-05-18 14:59:42 +01:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00
florian HENRY
986b4f78ba fix eldy comment 2018-05-18 13:54:07 +02:00
BENKE Charlene
24d353c9a7 inversion of dateo and datee 2018-05-18 12:24:44 +02:00
Laurent Destailleur
e01d9a62bc
Merge pull request #8776 from defrance/patch-114 
FIX : inversion of dateo and datee
 2018-05-18 12:21:58 +02:00
Laurent Destailleur
429efcc979
Merge pull request #8772 from wdammak/patch-2 
Documents generes movement warehouse
 2018-05-18 12:20:58 +02:00
Laurent Destailleur
f211cfaf0c
Merge pull request #8777 from grandoc/new_branch_11_05_2018 
clean and update code
 2018-05-18 12:20:22 +02:00
Laurent Destailleur
7de812d2ed
Merge pull request #8793 from atm-john/Fix_situation_discount_used 
Fix creating next situation invoice if a discount was allready apply
 2018-05-18 12:18:58 +02:00
Laurent Destailleur
f17fbfe125
Merge pull request #8814 from areaeuro/patch-2 
Remove Warning: A non-numeric value encountered
 2018-05-18 12:15:30 +02:00
Laurent Destailleur
b5f37b2876
Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling 
Fix product vat update error handling
 2018-05-18 12:00:03 +02:00
Laurent Destailleur
01275a4cfe
Merge pull request #8771 from wdammak/patch-1 
Add Documents generes warehouse module
 2018-05-18 11:59:22 +02:00
Laurent Destailleur
508f6c1a89 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:53:09 +02:00
Laurent Destailleur
6d0306f75a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-05-18 11:52:48 +02:00
Laurent Destailleur
5f8346f854 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:30 +02:00
Laurent Destailleur
492b1e7169 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:08 +02:00
Laurent Destailleur
75f5cdbc0f
Merge pull request #8810 from simnandez/7.0 
Fix: extrafiels is not passing orders to invoice
 2018-05-18 11:47:44 +02:00
Laurent Destailleur
24281028b7
Merge pull request #8807 from inoveaconseil/patch-2 
Fix missing params for commonGenerateDocument
 2018-05-18 11:43:11 +02:00
Laurent Destailleur
fa7f81c828 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:38:26 +02:00
Laurent Destailleur
a450f99e8a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-05-18 11:38:11 +02:00
Laurent Destailleur
0633d2f519
Merge pull request #8805 from bafbes/abb7007 
Fix: Add journal label translation in journal list
 2018-05-18 11:36:00 +02:00
Laurent Destailleur
004c85b4ed
Update journals_list.php 2018-05-18 11:35:37 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation 
Add credit note compatibility with situation invoice.
 2018-05-18 11:34:10 +02:00
Laurent Destailleur
162d271884
Merge pull request #8803 from atm-alexis/7.0_fix_task_contact_card_withoutproject 
FIX 7.0 task contact card without withproject parameters
 2018-05-18 11:29:11 +02:00
Laurent Destailleur
71f8971a8e
Merge pull request #8794 from ATM-Nicolas/fix_select_user 
FIX : Select user on add time spent form
 2018-05-18 11:27:05 +02:00
Laurent Destailleur
078ea2ce9b
Merge pull request #8790 from aspangaro/7.0-f1 
Fix : Double WHERE on admin/journal_list.php
 2018-05-18 11:20:05 +02:00
Laurent Destailleur
e2369dea29 FIX #8722 2018-05-18 11:17:21 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop 
Fix #8722 useless sql ORDER BY
 2018-05-18 11:16:08 +02:00
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
florian HENRY
a27c263747 NEW: add filter on project task list 2018-05-18 10:33:32 +02:00
areaeuro
11714b9b6b
Update societe.class.php 
Line 2942 throws an error in php 7 "Warning: A non-numeric value encountered" when doing math sum, as substr() may be empty.
Convert to intval(substr()) to fix.
 2018-05-18 10:27:54 +02:00
Juanjo Menent
dd259043cd Fix: Cashdesk does not apply multi-price or price per customer 2018-05-18 09:20:18 +02:00
Laurent Destailleur
26e10caa7d FIX #8813 2018-05-18 09:15:18 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24 
Update module assets
 2018-05-18 09:05:46 +02:00
Laurent Destailleur
c9d23d3930
Merge pull request #8783 from grandoc/new_branch_12_05_2018 
Clean and update code
 2018-05-18 08:56:06 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element 
Add propals lines inport on invoices.
 2018-05-18 08:55:29 +02:00
florian HENRY
1b4dcefcb0 fix hookname as uniq by card 2018-05-18 08:52:13 +02:00
fappels
90d2ccc79c Fix product vat update error handling 
Product vat update does not show update error if update result negative.
 2018-05-17 21:29:15 +02:00
Juanjo Menent
0aa8c6f498 Fix: extrafiels is not passing orders to invoice 2018-05-17 19:05:25 +02:00
Juanjo Menent
dc7a1610e7 Fix: extrafiels is not passing orders to invoice 2018-05-17 18:56:01 +02:00
Laurent Destailleur
1581e73906 Trans 2018-05-17 18:04:30 +02:00
Laurent Destailleur
a279451241 Fix can use actionmsg for generic trigger 2018-05-17 17:58:29 +02:00
John
8710cf570d Add table thead and tbody for object lines 2018-05-17 16:52:16 +02:00
Laurent Destailleur
a23d1f6b82 Code comment 2018-05-17 16:50:40 +02:00
Laurent Destailleur
ffb6a5db81 Fix use correct stripe env 2018-05-17 16:07:44 +02:00
Laurent Destailleur
4f6b0fead6 Fix filter on test/live mode for stripe card 2018-05-17 15:13:16 +02:00
Laurent Destailleur
1645c14e25 Fix deletion of stripe card 2018-05-17 13:51:17 +02:00
Inovea Conseil
5804d1d4a3
Fix missing params for commonGenerateDocument 
ADD param moreparams for compatibility with commonGenerateDocument
 2018-05-17 10:16:44 +02:00
Laurent Destailleur
200af6ea5c Fix stripe link 2018-05-17 09:45:31 +02:00
John
8175d90816 change case 2018-05-17 09:01:49 +02:00
Abbes Bahfir
933e277862 Fix: Add journal label translation in journal list 2018-05-16 19:59:56 +01:00
Laurent Destailleur
67ed1e0841 Fix filter criteria when using backto for events 2018-05-16 20:59:45 +02:00
Laurent Destailleur
133e736801 Fix save code 2018-05-16 20:52:45 +02:00
Laurent Destailleur
ac97ba9e36 Fix deletion of stripe card 
Solve validation of recurring invoice
 2018-05-16 20:41:01 +02:00