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

58562 Commits

Author SHA1 Message Date
Frédéric FRANCE
622c394283
loadlangs 2018-05-26 21:11:25 +02:00
Frédéric FRANCE
f5605bdd7d
loadlangs 2018-05-26 20:51:17 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
Frédéric FRANCE
f24a6ed4d6
loadlangs 2018-05-26 19:03:41 +02:00
Frédéric FRANCE
67e0abdd66
loadlangs 2018-05-26 18:52:14 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs 2018-05-26 18:41:16 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs 2018-05-26 17:57:30 +02:00
Frédéric FRANCE
812b182680
loadlangs 2018-05-26 17:04:23 +02:00
Frédéric FRANCE
e87ff4d9b0
loadlangs 2018-05-26 16:24:54 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs 2018-05-26 16:03:19 +02:00
Frédéric FRANCE
0a90f2d690
loadlangs 2018-05-26 15:50:03 +02:00
Frédéric FRANCE
cbed5c8349
loadlangs 2018-05-26 15:41:32 +02:00
Laurent Destailleur
894f16c5ee Fix navifation 2018-05-25 18:11:24 +02:00
Laurent Destailleur
b44717e706 Fix navifation 2018-05-25 18:06:13 +02:00
Laurent Destailleur
c78b1f1154 Fix navigation into page containers 2018-05-25 17:59:58 +02:00
Laurent Destailleur
d41b395a6d Fix edition of type of container 2018-05-25 17:52:24 +02:00
Laurent Destailleur
bfa9850211 NEW Add arrows to navigate into containers in website module 2018-05-25 17:47:03 +02:00
Laurent Destailleur
4c9d3d9679 Code comment 2018-05-25 15:58:45 +02:00
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